Skip to content

Commit 92aa73d

Browse files
authored
Merge master into dev-1.3.1
Merge master into dev-1.3.1
2 parents 7ccd4f0 + 373252a commit 92aa73d

28 files changed

Lines changed: 96 additions & 107 deletions

File tree

.asf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ github:
5353
- ws00428637
5454
- yyuser5201314
5555
- KangTomwk
56+
- guoshupei
57+
- rarexixi
5658
enabled_merge_buttons:
5759
merge: true
5860
squash: true

.github/ISSUE_TEMPLATE/ask_for_help .yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ body:
8686
````
8787
log file:
8888
<!-- 拖拽上传后,会自动生成如下示例格式的附件url -->
89-
[linkis-xxx.log](https://github.com/apache/incubator-linkis/files/9219529/yarn-error.log)
89+
[linkis-xxx.log](https://github.com/apache/linkis/files/9219529/yarn-error.log)
9090
9191
validations:
9292
required: true

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ body:
2424
value: |
2525
Thank you for reporting the problem!
2626
Please make sure what you are reporting is a bug with reproducible steps.
27-
To ask questions or share ideas, pleae post on our [Discussion page](https://github.com/apache/incubator-linkis/discussions) instead.
27+
To ask questions or share ideas, pleae post on our [Discussion page](https://github.com/apache/linkis/discussions) instead.
2828
2929
- type: checkboxes
3030
attributes:
3131
label: Search before asking
3232
description: >
33-
Please make sure to search in the [issues](https://github.com/apache/incubator-linkis/issues) first to see
33+
Please make sure to search in the [issues](https://github.com/apache/linkis/issues) first to see
3434
whether the same issue was reported already.
3535
options:
3636
- label: >
37-
I searched the [issues](https://github.com/apache/incubator-linkis/issues) and found no similar issues.
37+
I searched the [issues](https://github.com/apache/linkis/issues) and found no similar issues.
3838
required: true
3939
4040
- type: dropdown

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
blank_issues_enabled: fasle
1919
contact_links:
2020
- name: Get Support
21-
url: https://github.com/apache/incubator-linkis/discussions
21+
url: https://github.com/apache/linkis/discussions
2222
about: Ask a question or request support for using Linkis
2323

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ body:
3030
attributes:
3131
label: Search before asking
3232
description: >
33-
Please make sure to search in the [issues](https://github.com/apache/incubator-linkis/issues) first to see
33+
Please make sure to search in the [issues](https://github.com/apache/linkis/issues) first to see
3434
whether the same feature was requested already.
3535
options:
3636
- label: >
37-
I had searched in the [issues](https://github.com/apache/incubator-linkis/issues) and found no similar
37+
I had searched in the [issues](https://github.com/apache/linkis/issues) and found no similar
3838
feature requirement.
3939
required: true
4040
- type: textarea

.github/workflows/auto-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
token: ${{ secrets.GITHUB_TOKEN }}
3232
issue-number: ${{ github.event.issue.number }}
3333
body: |
34-
## :blush: Welcome to the Apache Linkis (incubating) community!!
34+
## :blush: Welcome to the Apache Linkis community!!
3535
We are glad that you are contributing by opening this issue.
3636
3737
Please make sure to include all the relevant context.

.github/workflows/build-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up JDK 8
3333
uses: actions/setup-java@v2
3434
with:
35-
distribution: 'adopt'
35+
distribution: 'temurin'
3636
java-version: 8
3737
- name: Build backend by maven
3838
run:

.github/workflows/dead-link-checker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
dead-links-check:
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 30
27-
if: (github.repository == 'apache/incubator-linkis')
27+
if: (github.repository == 'apache/linkis')
2828
steps:
2929
- uses: actions/checkout@v3
3030
- uses: gaurav-nelson/github-action-markdown-link-check@v1

.github/workflows/publish-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
TAG: ${{ github.sha }}
3232
SKIP_TEST: true
33-
HUB: ghcr.io/apache/incubator-linkis
33+
HUB: ghcr.io/apache/linkis
3434
LINKIS_VERSION: 1.3.1
3535
steps:
3636
- name: Checkout

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ The Linkis source code may have some temporary branches, but only the following
3838

3939
#### 2.1.1 Concept
4040

41-
- Upstream repository: <https://github.com/apache/incubator-linkis> The apache repository of linkis is called Upstream repository in the text
42-
- Fork repository: From <https://github.com/apache/incubator-linkis> fork to your own personal repository called Fork repository
41+
- Upstream repository: <https://github.com/apache/linkis> The apache repository of linkis is called Upstream repository in the text
42+
- Fork repository: From <https://github.com/apache/linkis> fork to your own personal repository called Fork repository
4343

4444
#### 2.1.2 Synchronize Upstream Repository
4545

@@ -60,7 +60,7 @@ Operate in your own clone's local project
6060
- Step1 Add the apacheUpstream repository image to the local
6161

6262
```shell script
63-
git remote add apache git@github.com:apache/incubator-linkis.git
63+
git remote add apache git@github.com:apache/linkis.git
6464
```
6565

6666
- Step2 Pull the apache image information to the local
@@ -126,7 +126,7 @@ We recommend to clone the dev branch and name it dev-fix for development. At the
126126

127127
```shell script
128128
#pull the branch
129-
git clone https://github.com/{githubid}/incubator-linkis.git --branch dev
129+
git clone https://github.com/{githubid}/linkis.git --branch dev
130130

131131
#Generate local dev-fix branch according to dev
132132
git checkout -b dev-fix dev
@@ -139,7 +139,7 @@ git push origin dev-fix dev-fix
139139

140140
- If you still don’t know how to initiate a PR to an open source project, please refer to [About issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues)
141141
- Issue name, which should briefly describe your problem or suggestion in one sentence; for the international promotion of the project, please write the issue in English or both Chinese and English
142-
- For each Issue, please bring at least two labels, component and type, such as component=Computation Governance/EngineConn, type=Improvement. Reference: [issue #590](https://github.com/apache/incubator-linkis/issues/590)
142+
- For each Issue, please bring at least two labels, component and type, such as component=Computation Governance/EngineConn, type=Improvement. Reference: [issue #590](https://github.com/apache/linkis/issues/590)
143143

144144
### 2.4 Pull Request(PR) Submission Guidelines
145145

0 commit comments

Comments
 (0)