diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 959636e9d..1c2fea214 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,12 +59,14 @@ jobs: ]]; then echo "::notice title=::This run will release '${REF}'" echo "do_release=true" >> $GITHUB_OUTPUT + echo "pom_version=${REF#v}" echo "pom_version=${REF#v}" >> $GITHUB_OUTPUT # pom_version is the tag without the 'v' prefix elif [[ "${GITHUB_EVENT_NAME}" =~ push|workflow_dispatch && "${REF}" == "refs/heads/master" && "${ACTOR}" == "arnaudroques" ]]; then echo "::notice title=::This run will release a snapshot" echo "do_snapshot_release=true" >> $GITHUB_OUTPUT V=$(perl -ne 'if (/return (\d{6,7});/) {$v=$1} if (/final int beta = (\d+);/) {$b=$1} END{print(substr($v, 0, 1),".", substr($v, 1, 4),"."); if ($b) {print(int(substr($v+1, 5)), "beta", $b);} else {print(int(substr($v, 5)))}}' src/net/sourceforge/plantuml/version/Version.java) + echo "pom_version=$V-SNAPSHOT" echo "pom_version=$V-SNAPSHOT" >> $GITHUB_OUTPUT # pom_version is taken from Version.java else @@ -252,7 +254,9 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ARTIFACT_SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ARTIFACT_SIGNING_PASSPHRASE }} run: | + echo "RELEASE_VERSION=$RELEASE_VERSION" .github/scripts/release-snapshot.sh + gradle --debug publish - name: Create release in GitHub and OSSRH if: needs.workflow_config.outputs.do_release == 'true' @@ -266,6 +270,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ARTIFACT_SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ARTIFACT_SIGNING_PASSPHRASE }} run: | + echo "RELEASE_VERSION=$RELEASE_VERSION" .github/scripts/release.sh gradle --debug publish