From 93f83ab5b81cf1fff18037111d3ae6434e92945f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=AE=87?= <940643974@qq.com> Date: Wed, 22 Nov 2023 21:35:20 +0800 Subject: [PATCH 1/6] chore(ci): add stage profile settings --- .github/configs/settings.xml | 60 ++++++++++++++++++++++++ .github/workflows/client-ci.yml | 7 +++ .github/workflows/codeql-analysis.yml | 8 ++++ .github/workflows/hubble-ci.yml | 7 +++ .github/workflows/license-checker.yml | 7 +++ .github/workflows/loader-ci.yml | 7 +++ .github/workflows/spark-connector-ci.yml | 7 +++ .github/workflows/tools-ci.yml | 6 +++ pom.xml | 11 +++++ 9 files changed, 120 insertions(+) create mode 100644 .github/configs/settings.xml diff --git a/.github/configs/settings.xml b/.github/configs/settings.xml new file mode 100644 index 000000000..294ded1cb --- /dev/null +++ b/.github/configs/settings.xml @@ -0,0 +1,60 @@ + + + + + + github + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} + + + + + + local-repo + + + central + https://repo.maven.apache.org/maven2 + + true + + + false + + + + staged-releases + https://repository.apache.org/content/groups/staging/ + + + + + staged-releases + https://repository.apache.org/content/groups/staging/ + + + + + + + local-repo + + diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 15488ae09..b577a920f 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -21,6 +21,7 @@ jobs: client-ci: runs-on: ubuntu-20.04 env: + USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-client/assembly/travis COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 strategy: @@ -41,6 +42,12 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Use staged maven repo + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Checkout uses: actions/checkout@v3 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d709ec895..838b4c5f6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,6 +20,8 @@ on: jobs: analyze: + env: + USE_STAGE: 'true' # Whether to include the stage repository. name: Analyze runs-on: ubuntu-latest permissions: @@ -42,6 +44,12 @@ jobs: with: distribution: 'zulu' java-version: '8' + + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - name: Use Node.js 16 uses: actions/setup-node@v3 diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml index 007b45f6d..cbbdfcca7 100644 --- a/.github/workflows/hubble-ci.yml +++ b/.github/workflows/hubble-ci.yml @@ -29,6 +29,7 @@ jobs: hubble-ci: runs-on: ubuntu-latest env: + USE_STAGE: 'true' # Whether to include the stage repository. STATIC_DIR: hugegraph-hubble/hubble-dist/assembly/static steps: - name: Install JDK 11 @@ -49,6 +50,12 @@ jobs: restore-keys: | ${{ runner.os }}-maven- + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Get Yarn path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 540de04e6..16ccea5ff 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -35,6 +35,7 @@ jobs: - name: Check License Header uses: apache/skywalking-eyes@main env: + SE_STAGE: 'true' # Whether to include the stage repository. GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: log: info @@ -45,6 +46,12 @@ jobs: java-version: '11' distribution: 'adopt' + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Use Node.js 16 uses: actions/setup-node@v3 with: diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml index 0a7db5224..6fdd29ffe 100644 --- a/.github/workflows/loader-ci.yml +++ b/.github/workflows/loader-ci.yml @@ -22,6 +22,7 @@ jobs: loader-ci: runs-on: ubuntu-latest env: + SE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-loader/assembly/travis STATIC_DIR: hugegraph-loader/assembly/static COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 @@ -42,6 +43,12 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Checkout uses: actions/checkout@v3 with: diff --git a/.github/workflows/spark-connector-ci.yml b/.github/workflows/spark-connector-ci.yml index efa4639be..4637a7e46 100644 --- a/.github/workflows/spark-connector-ci.yml +++ b/.github/workflows/spark-connector-ci.yml @@ -22,6 +22,7 @@ jobs: spark-connector-ci: runs-on: ubuntu-latest env: + SE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-spark-connector/assembly/travis VERSION_ID: 1.0.0 steps: @@ -38,6 +39,12 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Checkout uses: actions/checkout@v4 with: diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml index 5028048cc..d88e310cc 100644 --- a/.github/workflows/tools-ci.yml +++ b/.github/workflows/tools-ci.yml @@ -21,6 +21,7 @@ jobs: tools-ci: runs-on: ubuntu-latest env: + SE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-tools/assembly/travis # TODO: could we use one param to unify it? or use a action template (could use one ci file) COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 @@ -36,6 +37,11 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - name: Checkout uses: actions/checkout@v3 with: diff --git a/pom.xml b/pom.xml index 7eb4cb500..00d1ecd4f 100644 --- a/pom.xml +++ b/pom.xml @@ -375,6 +375,17 @@ + + + + stage + + + staged-releases + https://repository.apache.org/content/groups/staging/ + + + From 6bc34d61e8d81d53540dec83e78b6b4f2c97761e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=AE=87?= <940643974@qq.com> Date: Wed, 22 Nov 2023 22:20:05 +0800 Subject: [PATCH 2/6] fix --- .github/workflows/client-ci.yml | 10 +++++----- .github/workflows/hubble-ci.yml | 12 ++++++------ .github/workflows/loader-ci.yml | 10 +++++----- .github/workflows/spark-connector-ci.yml | 10 +++++----- .github/workflows/tools-ci.yml | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index b577a920f..e414921d1 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -42,17 +42,17 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 + - name: Use staged maven repo if: ${{ env.USE_STAGE == 'true' }} run: | cp $HOME/.m2/settings.xml /tmp/settings.xml mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Compile run: | mvn -e compile -pl hugegraph-client -Dmaven.javadoc.skip=true -ntp diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml index cbbdfcca7..c07078c1a 100644 --- a/.github/workflows/hubble-ci.yml +++ b/.github/workflows/hubble-ci.yml @@ -50,12 +50,6 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: use staged maven repo settings - if: ${{ env.USE_STAGE == 'true' }} - run: | - cp $HOME/.m2/settings.xml /tmp/settings.xml - mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: Get Yarn path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" @@ -83,6 +77,12 @@ jobs: with: fetch-depth: 2 + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: Compile run: | mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml index 6fdd29ffe..5789604b7 100644 --- a/.github/workflows/loader-ci.yml +++ b/.github/workflows/loader-ci.yml @@ -43,17 +43,17 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 + - name: use staged maven repo settings if: ${{ env.USE_STAGE == 'true' }} run: | cp $HOME/.m2/settings.xml /tmp/settings.xml mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Compile run: | mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp diff --git a/.github/workflows/spark-connector-ci.yml b/.github/workflows/spark-connector-ci.yml index 4637a7e46..1b23c1fe1 100644 --- a/.github/workflows/spark-connector-ci.yml +++ b/.github/workflows/spark-connector-ci.yml @@ -39,17 +39,17 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 2 + - name: use staged maven repo settings if: ${{ env.USE_STAGE == 'true' }} run: | cp $HOME/.m2/settings.xml /tmp/settings.xml mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - name: Compile run: | mvn install -pl hugegraph-spark-connector -Dmaven.javadoc.skip=true -DskipTests -ntp diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml index d88e310cc..c9531e581 100644 --- a/.github/workflows/tools-ci.yml +++ b/.github/workflows/tools-ci.yml @@ -37,15 +37,15 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 - name: use staged maven repo settings if: ${{ env.USE_STAGE == 'true' }} run: | cp $HOME/.m2/settings.xml /tmp/settings.xml mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - name: Compile run: | mvn install -pl hugegraph-client,hugegraph-tools -am -Dmaven.javadoc.skip=true -DskipTests -ntp From 9babb46ca6b1d8980951ab2431ffe2b3fe92b130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=AE=87?= <940643974@qq.com> Date: Wed, 22 Nov 2023 22:41:39 +0800 Subject: [PATCH 3/6] fix --- .github/workflows/license-checker.yml | 2 ++ .github/workflows/loader-ci.yml | 2 +- .github/workflows/spark-connector-ci.yml | 2 +- .github/workflows/tools-ci.yml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 16ccea5ff..fb81f3fe6 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -29,6 +29,8 @@ on: jobs: check-license-header: runs-on: ubuntu-latest + env: + USE_STAGE: 'true' # Whether to include the stage repository. steps: - uses: actions/checkout@v3 # More info could refer to: https://github.com/apache/skywalking-eyes diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml index 5789604b7..d3132a317 100644 --- a/.github/workflows/loader-ci.yml +++ b/.github/workflows/loader-ci.yml @@ -22,7 +22,7 @@ jobs: loader-ci: runs-on: ubuntu-latest env: - SE_STAGE: 'true' # Whether to include the stage repository. + USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-loader/assembly/travis STATIC_DIR: hugegraph-loader/assembly/static COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 diff --git a/.github/workflows/spark-connector-ci.yml b/.github/workflows/spark-connector-ci.yml index 1b23c1fe1..f398529a4 100644 --- a/.github/workflows/spark-connector-ci.yml +++ b/.github/workflows/spark-connector-ci.yml @@ -22,7 +22,7 @@ jobs: spark-connector-ci: runs-on: ubuntu-latest env: - SE_STAGE: 'true' # Whether to include the stage repository. + USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-spark-connector/assembly/travis VERSION_ID: 1.0.0 steps: diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml index c9531e581..f0e66625f 100644 --- a/.github/workflows/tools-ci.yml +++ b/.github/workflows/tools-ci.yml @@ -21,7 +21,7 @@ jobs: tools-ci: runs-on: ubuntu-latest env: - SE_STAGE: 'true' # Whether to include the stage repository. + USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-tools/assembly/travis # TODO: could we use one param to unify it? or use a action template (could use one ci file) COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 From 0d0d8c48608a51cf72e2aa139cab26b3587c71ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=AE=87?= <940643974@qq.com> Date: Thu, 23 Nov 2023 00:27:27 +0800 Subject: [PATCH 4/6] fix spark-connector-ci --- .github/workflows/spark-connector-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spark-connector-ci.yml b/.github/workflows/spark-connector-ci.yml index f398529a4..c5b312bc2 100644 --- a/.github/workflows/spark-connector-ci.yml +++ b/.github/workflows/spark-connector-ci.yml @@ -52,7 +52,7 @@ jobs: - name: Compile run: | - mvn install -pl hugegraph-spark-connector -Dmaven.javadoc.skip=true -DskipTests -ntp + mvn install -pl hugegraph-client,hugegraph-spark-connector -am -Dmaven.javadoc.skip=true -DskipTests -ntp - name: Prepare env and service run: | From 67b2542d60cbbcdd59067669e70a8a958d25e991 Mon Sep 17 00:00:00 2001 From: imbajin Date: Thu, 23 Nov 2023 14:50:39 +0800 Subject: [PATCH 5/6] Update .github/workflows/license-checker.yml --- .github/workflows/license-checker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index fb81f3fe6..6739af2f8 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -37,7 +37,6 @@ jobs: - name: Check License Header uses: apache/skywalking-eyes@main env: - SE_STAGE: 'true' # Whether to include the stage repository. GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: log: info From 04d2890ef7f9602c3411428c5e73a36979c59421 Mon Sep 17 00:00:00 2001 From: imbajin Date: Thu, 23 Nov 2023 17:40:55 +0800 Subject: [PATCH 6/6] Update license-checker.yml --- .github/workflows/license-checker.yml | 30 +++++++++------------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 6739af2f8..77a51fe62 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -29,10 +29,8 @@ on: jobs: check-license-header: runs-on: ubuntu-latest - env: - USE_STAGE: 'true' # Whether to include the stage repository. steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # More info could refer to: https://github.com/apache/skywalking-eyes - name: Check License Header uses: apache/skywalking-eyes@main @@ -42,22 +40,6 @@ jobs: log: info config: .licenserc.yaml - - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'adopt' - - - name: use staged maven repo settings - if: ${{ env.USE_STAGE == 'true' }} - run: | - cp $HOME/.m2/settings.xml /tmp/settings.xml - mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml - - - name: Use Node.js 16 - uses: actions/setup-node@v3 - with: - node-version: '16' - - name: License check(RAT) run: | mvn apache-rat:check -ntp @@ -68,9 +50,10 @@ jobs: runs-on: ubuntu-latest env: SCRIPT_DEPENDENCY: hugegraph-dist/scripts/dependency + USE_STAGE: 'true' # Whether to include the stage repository. steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 uses: actions/setup-java@v3 with: @@ -80,6 +63,13 @@ jobs: uses: actions/setup-node@v3 with: node-version: '16' + + - name: use staged maven repo settings + if: ${{ env.USE_STAGE == 'true' }} + run: | + cp $HOME/.m2/settings.xml /tmp/settings.xml + mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml + - name: mvn install run: | mvn install -DskipTests=true -ntp