diff --git a/.github/workflows/check-update.yml b/.github/workflows/check-update.yml index 76e6cbbac..8af98eed4 100644 --- a/.github/workflows/check-update.yml +++ b/.github/workflows/check-update.yml @@ -20,18 +20,13 @@ jobs: wget -O ci.json https://ci.huangyuhui.net/job/HMCL/lastSuccessfulBuild/api/json export HMCL_EXE_FILE_NAME=`cat ci.json | jq -M -r '.artifacts[] | select(.fileName | endswith(".exe")) | .fileName'` - if [ -z `echo $HMCL_EXE_FILE_NAME | grep "^HMCL-[0-9]\.[0-9]\.[0-9]\{3\}\.exe\$"` ]; then exit 1; fi + if [ -z `echo $HMCL_EXE_FILE_NAME | grep -E "^HMCL-[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?\.exe\$"` ]; then exit 1; fi - export HMCL_BASE_VERSION=${HMCL_EXE_FILE_NAME:5:3} - export HMCL_BUILD_NUMBER=`cat ci.json | jq -M -r '.id'` - export HMCL_VERSION="$HMCL_BASE_VERSION.$HMCL_BUILD_NUMBER" + export HMCL_VERSION=`echo "${HMCL_EXE_FILE_NAME%.exe}" | tail -c +6` export HMCL_COMMIT_SHA=`cat ci.json | jq -M -r '.actions[] | select(._class == "hudson.plugins.git.util.BuildData") | .lastBuiltRevision.SHA1'` - if [ "${#HMCL_BUILD_NUMBER}" != 3 ]; then exit 1; fi if [ "${#HMCL_COMMIT_SHA}" != 40 ]; then exit 1; fi - echo "HMCL_BASE_VERSION=$HMCL_BASE_VERSION" >> $GITHUB_ENV - echo "HMCL_BUILD_NUMBER=$HMCL_BUILD_NUMBER" >> $GITHUB_ENV echo "HMCL_VERSION=$HMCL_VERSION" >> $GITHUB_ENV echo "HMCL_COMMIT_SHA=$HMCL_COMMIT_SHA" >> $GITHUB_ENV echo "HMCL_TAG_NAME=v$HMCL_VERSION" >> $GITHUB_ENV @@ -45,7 +40,7 @@ jobs: wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar" wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar.sha1" env: - DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/${{ env.HMCL_BUILD_NUMBER }}/artifact/HMCL/build/libs + DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/lastSuccessfulBuild/artifact/HMCL/build/libs - name: Generate release note if: ${{ env.continue == 'true' }} run: |