diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml index 2920f6ad4..e25a44043 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: @@ -64,6 +64,9 @@ jobs: - name: 1. Download SVN Sources run: | + if [[ ${{ matrix.os }} =~ "macos" ]]; then + brew install svn + fi rm -rf dist/${{ inputs.release_version }} svn co ${URL_PREFIX}/${{ inputs.release_version }} dist/${{ inputs.release_version }} @@ -99,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" @@ -165,12 +168,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 @@ -292,7 +298,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 @@ -331,13 +338,14 @@ 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 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] diff --git a/dist/validate-release.sh b/dist/validate-release.sh index aed42d7e9..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 @@ -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 @@ -290,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 @@ -329,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