Skip to content

Commit

Permalink
[feat-4051] remove incubator in path (apache#4058)
Browse files Browse the repository at this point in the history
* remove incubator in path
  • Loading branch information
aiceflower authored Dec 29, 2022
1 parent bee40dd commit 1bd458a
Show file tree
Hide file tree
Showing 20 changed files with 76 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/ask_for_help .yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ body:
````
log file:
<!-- 拖拽上传后,会自动生成如下示例格式的附件url -->
[linkis-xxx.log](https://github.com/apache/incubator-linkis/files/9219529/yarn-error.log)
[linkis-xxx.log](https://github.com/apache/linkis/files/9219529/yarn-error.log)
validations:
required: true
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ body:
value: |
Thank you for reporting the problem!
Please make sure what you are reporting is a bug with reproducible steps.
To ask questions or share ideas, pleae post on our [Discussion page](https://github.com/apache/incubator-linkis/discussions) instead.
To ask questions or share ideas, pleae post on our [Discussion page](https://github.com/apache/linkis/discussions) instead.
- type: checkboxes
attributes:
label: Search before asking
description: >
Please make sure to search in the [issues](https://github.com/apache/incubator-linkis/issues) first to see
Please make sure to search in the [issues](https://github.com/apache/linkis/issues) first to see
whether the same issue was reported already.
options:
- label: >
I searched the [issues](https://github.com/apache/incubator-linkis/issues) and found no similar issues.
I searched the [issues](https://github.com/apache/linkis/issues) and found no similar issues.
required: true
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
blank_issues_enabled: fasle
contact_links:
- name: Get Support
url: https://github.com/apache/incubator-linkis/discussions
url: https://github.com/apache/linkis/discussions
about: Ask a question or request support for using Linkis

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ body:
attributes:
label: Search before asking
description: >
Please make sure to search in the [issues](https://github.com/apache/incubator-linkis/issues) first to see
Please make sure to search in the [issues](https://github.com/apache/linkis/issues) first to see
whether the same feature was requested already.
options:
- label: >
I had searched in the [issues](https://github.com/apache/incubator-linkis/issues) and found no similar
I had searched in the [issues](https://github.com/apache/linkis/issues) and found no similar
feature requirement.
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
## :blush: Welcome to the Apache Linkis (incubating) community!!
## :blush: Welcome to the Apache Linkis community!!
We are glad that you are contributing by opening this issue.
Please make sure to include all the relevant context.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dead-link-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
dead-links-check:
runs-on: ubuntu-latest
timeout-minutes: 30
if: (github.repository == 'apache/incubator-linkis')
if: (github.repository == 'apache/linkis')
steps:
- uses: actions/checkout@v3
- uses: gaurav-nelson/github-action-markdown-link-check@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
env:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/incubator-linkis
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.3.1
steps:
- name: Checkout
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ The Linkis source code may have some temporary branches, but only the following

#### 2.1.1 Concept

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

#### 2.1.2 Synchronize Upstream Repository

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

```shell script
git remote add apache [email protected]:apache/incubator-linkis.git
git remote add apache [email protected]:apache/linkis.git
```

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

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

#Generate local dev-fix branch according to dev
git checkout -b dev-fix dev
Expand All @@ -139,7 +139,7 @@ git push origin dev-fix dev-fix

- 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)
- 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
- 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)
- 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)

### 2.4 Pull Request(PR) Submission Guidelines

Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Linkis 源码可能会产生一些临时分支,但真正有明确意义的只

#### 2.1.1 概念

- Upstream 仓库:<https://github.com/apache/incubator-linkis> linkis 的 apache 仓库文中称为 Upstream 仓库
- Fork 仓库: 从 <https://github.com/apache/incubator-linkis> fork 到自己个人仓库 称为 Fork 仓库
- Upstream 仓库:<https://github.com/apache/linkis> linkis 的 apache 仓库文中称为 Upstream 仓库
- Fork 仓库: 从 <https://github.com/apache/linkis> fork 到自己个人仓库 称为 Fork 仓库

#### 2.1.2 同步 Upstream 仓库分支最新代码到自己的 Fork 仓库

Expand All @@ -56,7 +56,7 @@ Linkis 源码可能会产生一些临时分支,但真正有明确意义的只
- step1 添加 apacheUpstream 仓库镜像到本地

```shell script
git remote add apache [email protected]:apache/incubator-linkis.git
git remote add apache [email protected]:apache/linkis.git
```

- step2 拉去 apache 镜像信息到本地
Expand Down Expand Up @@ -122,7 +122,7 @@ Linkis 前后端代码共用同一个代码库,但在开发上是分离的。

```shell script
#拉取分支
git clone https://github.com/{githubid}/incubator-linkis.git --branch dev
git clone https://github.com/{githubid}/linkis.git --branch dev
#根据 dev 生成本地 dev-fix 分支
git checkout -b dev-fix dev
#把本地 dev-fix 分支推到自己的仓库
Expand All @@ -133,7 +133,7 @@ git push origin dev-fix dev-fix

- 如果您还不知道怎样向开源项目发起 PR,请参考[About issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues)
- Issue 名称,应一句话简单描述您的问题或建议;为了项目的国际化推广,请用英文,或中英文双语书写 issue
- 每个 Issue,请至少带上 component 和 type 两个 label,如 component=Computation Governance/EngineConn,type=Improvement.参考:[issue #590](https://github.com/apache/incubator-linkis/issues/590)
- 每个 Issue,请至少带上 component 和 type 两个 label,如 component=Computation Governance/EngineConn,type=Improvement.参考:[issue #590](https://github.com/apache/linkis/issues/590)

### 2.4 Pull Request(PR) 提交指引

Expand Down
6 changes: 0 additions & 6 deletions DISCLAIMER

This file was deleted.

28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h2 align="center">
Apache Linkis(Incubating)
Apache Linkis
</h2>

<p align="center">
Expand All @@ -23,24 +23,24 @@
<a target="_blank" href="https://search.maven.org/search?q=g:org.apache.linkis%20AND%20a:linkis">
<img src="https://img.shields.io/maven-central/v/org.apache.linkis/linkis.svg?label=maven%20central" />
</a>
<a target="_blank" href="https://github.com/apache/incubator-linkis/blob/master/LICENSE">
<a target="_blank" href="https://github.com/apache/linkis/blob/master/LICENSE">
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license" />
</a>
<a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
<img src="https://img.shields.io/badge/JDK-8-green.svg" />
</a>
<a target="_blank" href="https://github.com/apache/incubator-linkis/actions">
<img src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg" />
<a target="_blank" href="https://github.com/apache/linkis/actions">
<img src="https://github.com/apache/linkis/actions/workflows//build-backend.yml/badge.svg" />
</a>

<a target="_blank" href='https://github.com/apache/incubator-linkis'>
<img src="https://img.shields.io/github/forks/apache/incubator-linkis.svg" alt="github forks"/>
<a target="_blank" href='https://github.com/apache/linkis'>
<img src="https://img.shields.io/github/forks/apache/linkis.svg" alt="github forks"/>
</a>
<a target="_blank" href='https://github.com/apache/incubator-linkis'>
<img src="https://img.shields.io/github/stars/apache/incubator-linkis.svg" alt="github stars"/>
<a target="_blank" href='https://github.com/apache/linkis'>
<img src="https://img.shields.io/github/stars/apache/linkis.svg" alt="github stars"/>
</a>
<a target="_blank" href='https://github.com/apache/incubator-linkis'>
<img src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg" alt="github contributors"/>
<a target="_blank" href='https://github.com/apache/linkis'>
<img src="https://img.shields.io/github/contributors/apache/linkis.svg" alt="github contributors"/>
</a>
<a target="_blank" href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
<img src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
Expand Down Expand Up @@ -143,7 +143,7 @@ mvnw.cmd -N install
mvnw.cmd clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true

## compile web
cd incubator-linkis/linkis-web
cd linkis/linkis-web
npm install
npm run build
```
Expand All @@ -169,7 +169,7 @@ Please refer to [Quick Deployment](https://linkis.apache.org/docs/latest/deploym

# Documentation & Vedio

- The documentation of linkis is in [Linkis-Website Git Repository](https://github.com/apache/incubator-linkis-website)
- The documentation of linkis is in [Linkis-Website Git Repository](https://github.com/apache/linkis-website)
- Meetup videos on [Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656)

# Architecture
Expand All @@ -189,7 +189,7 @@ For code and documentation contributions, please follow the [contribution guide]
# Contact Us


- Any questions or suggestions please kindly submit an [issue](https://github.com/apache/incubator-linkis/issues).
- Any questions or suggestions please kindly submit an [issue](https://github.com/apache/linkis/issues).
- By mail [[email protected]](mailto:[email protected])
- You can scan the QR code below to join our WeChat group to get more immediate response

Expand All @@ -198,5 +198,5 @@ For code and documentation contributions, please follow the [contribution guide]

# Who is Using Linkis

We opened an issue [[Who is Using Linkis]](https://github.com/apache/incubator-linkis/issues/23) for users to feedback and record who is using Linkis.
We opened an issue [[Who is Using Linkis]](https://github.com/apache/linkis/issues/23) for users to feedback and record who is using Linkis.
Since the first release of Linkis in 2019, it has accumulated more than **700** trial companies and **1000+** sandbox trial users, which involving diverse industries, from finance, banking, tele-communication, to manufactory, internet companies and so on.
26 changes: 13 additions & 13 deletions README_CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h2 align="center">
Apache Linkis(Incubating)
Apache Linkis
</h2>

<p align="center">
Expand All @@ -22,24 +22,24 @@
<a target="_blank" href="https://search.maven.org/search?q=g:org.apache.linkis%20AND%20a:linkis">
<img src="https://img.shields.io/maven-central/v/org.apache.linkis/linkis.svg?label=maven%20central" />
</a>
<a target="_blank" href="https://github.com/apache/incubator-linkis/blob/master/LICENSE">
<a target="_blank" href="https://github.com/apache/linkis/blob/master/LICENSE">
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license" />
</a>
<a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
<img src="https://img.shields.io/badge/JDK-8-green.svg" />
</a>
<a target="_blank" href="https://github.com/apache/incubator-linkis/actions">
<img src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg" />
<a target="_blank" href="https://github.com/apache/linkis/actions">
<img src="https://github.com/apache/linkis/actions/workflows//build-backend.yml/badge.svg" />
</a>

<a target="_blank" href='https://github.com/apache/incubator-linkis'>
<img src="https://img.shields.io/github/forks/apache/incubator-linkis.svg" alt="github forks"/>
<a target="_blank" href='https://github.com/apache/linkis'>
<img src="https://img.shields.io/github/forks/apache/linkis.svg" alt="github forks"/>
</a>
<a target="_blank" href='https://github.com/apache/incubator-linkis'>
<img src="https://img.shields.io/github/stars/apache/incubator-linkis.svg" alt="github stars"/>
<a target="_blank" href='https://github.com/apache/linkis'>
<img src="https://img.shields.io/github/stars/apache/linkis.svg" alt="github stars"/>
</a>
<a target="_blank" href='https://github.com/apache/incubator-linkis'>
<img src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg" alt="github contributors"/>
<a target="_blank" href='https://github.com/apache/linkis'>
<img src="https://img.shields.io/github/contributors/apache/linkis.svg" alt="github contributors"/>
</a>
<a target="_blank" href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
<img src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
Expand Down Expand Up @@ -136,7 +136,7 @@ mvnw.cmd clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true


## 管理台编译
cd incubator-linkis/linkis-web
cd linkis/linkis-web
npm install
npm run build
```
Expand All @@ -161,7 +161,7 @@ $> ./linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh

# 文档&视频

- 完整的 Linkis 文档代码存放在[linkis-website 仓库中 ](https://github.com/apache/incubator-linkis-website)
- 完整的 Linkis 文档代码存放在[linkis-website 仓库中 ](https://github.com/apache/linkis-website)

- Meetup 视频 [Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656)

Expand Down Expand Up @@ -191,5 +191,5 @@ Linkis 基于微服务架构开发,其服务可以分为 3 类:计算治理服

# 谁在使用 Linkis

我们创建了一个 issue [[Who is Using Linkis]](https://github.com/apache/incubator-linkis/issues/23) 以便用户反馈和记录谁在使用 Linkis.
我们创建了一个 issue [[Who is Using Linkis]](https://github.com/apache/linkis/issues/23) 以便用户反馈和记录谁在使用 Linkis.
Linkis 自 2019 年开源发布以来,累计已有 700 多家试验企业和 1000+沙盒试验用户,涉及金融、电信、制造、互联网等多个行业。
18 changes: 9 additions & 9 deletions linkis-dist/bin/install-linkis-to-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ help() {

#pull the container image of the linkis
pull(){
debug ${MIRRORS}/apache/incubator-linkis/linkis-ldh:${TAG}
docker pull ${MIRRORS}/apache/incubator-linkis/linkis-ldh:${TAG}
debug ${MIRRORS}/apache/incubator-linkis/linkis:${TAG}
docker pull ${MIRRORS}/apache/incubator-linkis/linkis:${TAG}
debug ${MIRRORS}/apache/incubator-linkis/linkis-web:${TAG}
docker pull ${MIRRORS}/apache/incubator-linkis/linkis-web:${TAG}
debug ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
docker pull ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
debug ${MIRRORS}/apache/linkis/linkis:${TAG}
docker pull ${MIRRORS}/apache/linkis/linkis:${TAG}
debug ${MIRRORS}/apache/linkis/linkis-web:${TAG}
docker pull ${MIRRORS}/apache/linkis/linkis-web:${TAG}
}
#change the label
tag(){
docker tag ${MIRRORS}/apache/incubator-linkis/linkis:${TAG} linkis:dev
docker tag ${MIRRORS}/apache/incubator-linkis/linkis-web:${TAG} linkis-web:dev
docker tag ${MIRRORS}/apache/incubator-linkis/linkis-ldh:${TAG} linkis-ldh:dev
docker tag ${MIRRORS}/apache/linkis/linkis:${TAG} linkis:dev
docker tag ${MIRRORS}/apache/linkis/linkis-web:${TAG} linkis-web:dev
docker tag ${MIRRORS}/apache/linkis/linkis-ldh:${TAG} linkis-ldh:dev
}
#create an image to carry mysql
make_linikis_image_with_mysql_jdbc(){
Expand Down
2 changes: 1 addition & 1 deletion linkis-dist/docker/ldh.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ARG LINKIS_VERSION=0.0.0
RUN useradd -r -s /bin/bash -u 100001 -g root -G wheel hadoop

# if you want to set specific yum repos conf file, you can put its at linkis-dist/docker/CentOS-Base.repo
# and exec [COPY apache-linkis-*-incubating-bin/docker/CentOS-Epel.repo /etc/yum.repos.d/CentOS-Epel.repo]
# and exec [COPY apache-linkis-*-bin/docker/CentOS-Epel.repo /etc/yum.repos.d/CentOS-Epel.repo]

# TODO: remove install mysql client when schema-init-tools is ready
RUN yum install -y \
Expand Down
4 changes: 2 additions & 2 deletions linkis-dist/docker/linkis.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ARG JDK_VERSION=1.8.0-openjdk
ARG JDK_BUILD_REVISION=1.8.0.332.b09-1.el7_9

# if you want to set specific yum repos conf file, you can put its at linkis-dist/docker/CentOS-Base.repo
# and exec [COPY apache-linkis-*-incubating-bin/docker/CentOS-Epel.repo /etc/yum.repos.d/CentOS-Epel.repo]
# and exec [COPY apache-linkis-*-bin/docker/CentOS-Epel.repo /etc/yum.repos.d/CentOS-Epel.repo]

# TODO: remove install mysql client when schema-init-tools is ready
RUN yum install -y \
Expand Down Expand Up @@ -74,7 +74,7 @@ ENV LINKIS_CLIENT_CONF_DIR ${LINKIS_CONF_DIR}
ENV LINKIS_HOME ${LINKIS_HOME}

# can do some pre-operations
ADD apache-linkis-${LINKIS_VERSION}-incubating-bin /opt/tmp/
ADD apache-linkis-${LINKIS_VERSION}-bin /opt/tmp/

RUN mv /opt/tmp/linkis-package/* ${LINKIS_HOME}/ \
&& mv /opt/tmp/LICENSE ${LINKIS_HOME}/ \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,6 @@ INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hos



-- https://github.com/apache/incubator-linkis/issues/1899
-- https://github.com/apache/linkis/issues/1899
update `linkis_cg_rm_external_resource_provider` set `name` = 'default' where name = 'sit' and `resource_type` = 'Yarn';

2 changes: 1 addition & 1 deletion linkis-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
<phase>package</phase>
<configuration>
<skipAssembly>false</skipAssembly>
<finalName>apache-linkis-${project.version}-incubating-bin</finalName>
<finalName>apache-linkis-${project.version}-bin</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<descriptors>
Expand Down
1 change: 0 additions & 1 deletion linkis-dist/src/main/assembly/distribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
<outputDirectory></outputDirectory>
<includes>
<include>README*</include>
<include>DISCLAIMER*</include>
</includes>
</fileSet>

Expand Down
Loading

0 comments on commit 1bd458a

Please sign in to comment.