From 25dbf4e6202a4849f6d266b4411584ebcf03f76e Mon Sep 17 00:00:00 2001 From: V_Galaxy Date: Tue, 12 Nov 2024 18:04:29 +0800 Subject: [PATCH 1/7] update --- .github/workflows/validate-release.yml | 13 ++++++++----- dist/validate-release.sh | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 2920f6ad4..7aa26052a 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -6,11 +6,11 @@ on: release_version: required: true description: svn release version - default: '1.3.0' + default: '1.5.0' gpg_user: required: true - description: current release manager(gpg username) - default: 'imbajin' + description: current release manager (gpg username) + default: 'vgalaxies' push: branches: @@ -165,12 +165,15 @@ jobs: done # 4.8 test compile the packages - if [[ (${{ matrix.java_version }} == 8 && "$i" =~ "computer") ]] || [[ "$i" =~ 'hugegraph-ai' ]]; then + if [[ (${{ matrix.java_version }} == 8 && "$i" =~ "computer") ]] || [[ "$i" =~ "hugegraph-ai" ]]; then echo "Skip compile computer module in java8 & AI module in all versions" popd || exit continue fi # TODO: consider using commands that are entirely consistent with building binary packages + if [[ "$i" =~ "computer" ]]; then + cd computer + fi mvn package -DskipTests -Papache-release -ntp -e || exit ls -lh @@ -338,6 +341,6 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['8','11'] + java_version: ['8', '11'] # TODO: support windows-latest or other OS in future os: [ubuntu-latest, macos-latest] diff --git a/dist/validate-release.sh b/dist/validate-release.sh index aed42d7e9..155aef89e 100755 --- a/dist/validate-release.sh +++ b/dist/validate-release.sh @@ -160,6 +160,9 @@ for i in *src.tar.gz; do echo "Skip compile $i module in all versions" elif [[ "$i" =~ "hugegraph-commons" ]]; then mvn install -DskipTests -Papache-release -ntp -e + elif [[ "$i" =~ "hugegraph-computer" ]]; then + cd computer + mvn install -DskipTests -Papache-release -ntp -e else # TODO: consider using commands that are entirely consistent with building binary packages mvn package -DskipTests -Papache-release -ntp -e From e26c0286efddb58365ad5b4bf23678d1c55eb767 Mon Sep 17 00:00:00 2001 From: V_Galaxy Date: Tue, 12 Nov 2024 18:37:03 +0800 Subject: [PATCH 2/7] fix path --- .github/workflows/validate-release.yml | 3 ++- dist/validate-release.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 7aa26052a..7cc800b1d 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -295,7 +295,8 @@ jobs: run: | cd dist/${{ inputs.release_version }} || exit - pushd ./*hugegraph-incubating*${{ inputs.release_version }} || exit + # TODO: run pd & store + pushd ./*hugegraph-incubating*${{ inputs.release_version }}/*hugegraph-server-incubating*${{ inputs.release_version }} || exit bin/init-store.sh || exit sleep 3 bin/start-hugegraph.sh || exit diff --git a/dist/validate-release.sh b/dist/validate-release.sh index 155aef89e..24a5acb84 100755 --- a/dist/validate-release.sh +++ b/dist/validate-release.sh @@ -293,7 +293,8 @@ done ######################################### cd "${WORK_DIR}/dist/${RELEASE_VERSION}" -pushd ./*hugegraph-incubating*"${RELEASE_VERSION}" +# TODO: run pd & store +pushd ./*hugegraph-incubating*"${RELEASE_VERSION}"/*hugegraph-server-incubating*"${RELEASE_VERSION}" bin/init-store.sh sleep 3 bin/start-hugegraph.sh From 10b830c013cc9a797631736f06bfad71b20f3a85 Mon Sep 17 00:00:00 2001 From: V_Galaxy Date: Wed, 13 Nov 2024 07:42:26 +0800 Subject: [PATCH 3/7] fix path --- .github/workflows/validate-release.yml | 2 +- dist/validate-release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 7cc800b1d..534c515b1 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -335,7 +335,7 @@ jobs: popd || exit # stop server - pushd ./*hugegraph-incubating*${{ inputs.release_version }} || exit + pushd ./*hugegraph-incubating*${{ inputs.release_version }}/*hugegraph-server-incubating*${{ inputs.release_version }} || exit bin/stop-hugegraph.sh || exit popd || exit diff --git a/dist/validate-release.sh b/dist/validate-release.sh index 24a5acb84..71e90f76e 100755 --- a/dist/validate-release.sh +++ b/dist/validate-release.sh @@ -333,7 +333,7 @@ popd popd # stop server -pushd ./*hugegraph-incubating*"${RELEASE_VERSION}" +pushd ./*hugegraph-incubating*"${RELEASE_VERSION}"/*hugegraph-server-incubating*"${RELEASE_VERSION}" bin/stop-hugegraph.sh popd From 06353a4c3cf46ed78c53ad75722242c9bf4432b7 Mon Sep 17 00:00:00 2001 From: V_Galaxy Date: Wed, 13 Nov 2024 09:00:19 +0800 Subject: [PATCH 4/7] update --- .github/workflows/validate-release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 534c515b1..b0670c4fd 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -64,6 +64,9 @@ jobs: - name: 1. Download SVN Sources run: | + if [[ ${{ matrix.java_version }} =~ "macos" ]]; then + brew install svn + fi rm -rf dist/${{ inputs.release_version }} svn co ${URL_PREFIX}/${{ inputs.release_version }} dist/${{ inputs.release_version }} From a52f6a22d96578b2bf604190d03ace4841bdf0ef Mon Sep 17 00:00:00 2001 From: V_Galaxy Date: Wed, 13 Nov 2024 09:01:11 +0800 Subject: [PATCH 5/7] fixup --- .github/workflows/validate-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index b0670c4fd..843f3a6c8 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -64,7 +64,7 @@ jobs: - name: 1. Download SVN Sources run: | - if [[ ${{ matrix.java_version }} =~ "macos" ]]; then + if [[ ${{ matrix.os }} =~ "macos" ]]; then brew install svn fi rm -rf dist/${{ inputs.release_version }} From 17ae4eef5a6bb947cac0a355881a3b13c7183832 Mon Sep 17 00:00:00 2001 From: V_Galaxy Date: Wed, 13 Nov 2024 13:45:24 +0800 Subject: [PATCH 6/7] disable java8 because of server --- .github/workflows/validate-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 843f3a6c8..5bb096567 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -345,6 +345,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['8', '11'] + # disable java8 because of server + java_version: ['11'] # TODO: support windows-latest or other OS in future os: [ubuntu-latest, macos-latest] From 1220beb659df00000c89631c5ac52d0bc068d20e Mon Sep 17 00:00:00 2001 From: VGalaxies Date: Wed, 27 Nov 2024 17:01:58 +0800 Subject: [PATCH 7/7] add JSON license to CATEGORY_X --- .github/workflows/validate-release.yml | 2 +- dist/validate-release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 5bb096567..e25a44043 100644 --- a/.github/workflows/validate-release.yml +++ b/.github/workflows/validate-release.yml @@ -102,7 +102,7 @@ jobs: cd dist/${{ inputs.release_version }} || exit ls -lh ./*.tar.gz - CATEGORY_X="\bGPL|\bLGPL|Sleepycat License|BSD-4-Clause|\bBCL\b|JSR-275|Amazon Software License|\bRSAL\b|\bQPL\b|\bSSPL|\bCPOL|\bNPL1|Creative Commons Non-Commercial" + CATEGORY_X="\bGPL|\bLGPL|Sleepycat License|BSD-4-Clause|\bBCL\b|JSR-275|Amazon Software License|\bRSAL\b|\bQPL\b|\bSSPL|\bCPOL|\bNPL1|Creative Commons Non-Commercial|JSON" CATEGORY_B="\bCDDL1|\bCPL|\bEPL|\bIPL|\bMPL|\bSPL|OSL-3.0|UnRAR License|Erlang Public License|\bOFL\b|Ubuntu Font License Version 1.0|IPA Font License Agreement v1.0|EPL2.0|CC-BY" for i in *src.tar.gz; do echo "$i" diff --git a/dist/validate-release.sh b/dist/validate-release.sh index 71e90f76e..8573b12fb 100755 --- a/dist/validate-release.sh +++ b/dist/validate-release.sh @@ -85,7 +85,7 @@ done #################################### cd "${WORK_DIR}/dist/${RELEASE_VERSION}" -CATEGORY_X="\bGPL|\bLGPL|Sleepycat License|BSD-4-Clause|\bBCL\b|JSR-275|Amazon Software License|\bRSAL\b|\bQPL\b|\bSSPL|\bCPOL|\bNPL1|Creative Commons Non-Commercial" +CATEGORY_X="\bGPL|\bLGPL|Sleepycat License|BSD-4-Clause|\bBCL\b|JSR-275|Amazon Software License|\bRSAL\b|\bQPL\b|\bSSPL|\bCPOL|\bNPL1|Creative Commons Non-Commercial|JSON" CATEGORY_B="\bCDDL1|\bCPL|\bEPL|\bIPL|\bMPL|\bSPL|OSL-3.0|UnRAR License|Erlang Public License|\bOFL\b|Ubuntu Font License Version 1.0|IPA Font License Agreement v1.0|EPL2.0|CC-BY" ls -lh ./*.tar.gz for i in *src.tar.gz; do