From b0cd8aa7920dc2f422397f336d7423a086ee2e7b Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Mon, 30 May 2022 13:48:34 +0400 Subject: [PATCH 1/2] Update build.yml --- .github/workflows/build.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7496a33..c41b055 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,8 @@ jobs: echo "::set-output name=version::$VERSION" echo "SPP_CLI_VERSION=$VERSION" >> $GITHUB_ENV echo "SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}" >> $GITHUB_ENV + SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/} + echo "::set-output name=release_version::$SPP_RELEASE_VERSION" - name: Build native spp-cli (Release) if: github.ref == 'refs/heads/master' @@ -89,6 +91,8 @@ jobs: echo "::set-output name=version::$VERSION" echo "SPP_CLI_VERSION=$VERSION" >> $GITHUB_ENV echo "SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}" >> $GITHUB_ENV + SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/} + echo "::set-output name=release_version::$SPP_RELEASE_VERSION" - name: Build native spp-cli.exe (Release) if: github.ref == 'refs/heads/master' @@ -146,6 +150,8 @@ jobs: echo "::set-output name=version::$VERSION" echo "SPP_CLI_VERSION=$VERSION" >> $GITHUB_ENV echo "SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/}" >> $GITHUB_ENV + SPP_RELEASE_VERSION=${VERSION/-SNAPSHOT/} + echo "::set-output name=release_version::$SPP_RELEASE_VERSION" - name: Build native spp-cli (Release) if: github.ref == 'refs/heads/master' @@ -257,8 +263,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ needs.buildOnLinux.outputs.version }} - release_name: v${{ needs.buildOnLinux.outputs.version }} + tag_name: ${{ needs.buildOnLinux.outputs.release_version }} + release_name: v${{ needs.buildOnLinux.outputs.release_version }} body: ${{ needs.build.outputs.changelog }} draft: true @@ -274,7 +280,7 @@ jobs: with: upload_url: ${{ steps.createDraft.outputs.upload_url }} asset_path: ./spp-cli-macOS.zip - asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-macOS.zip + asset_name: spp-cli-${{ needs.buildOnLinux.outputs.release_version }}-macOS.zip asset_content_type: application/zip - name: Download spp-cli-win64 artifact @@ -289,7 +295,7 @@ jobs: with: upload_url: ${{ steps.createDraft.outputs.upload_url }} asset_path: ./spp-cli-win64.zip - asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-win64.zip + asset_name: spp-cli-${{ needs.buildOnLinux.outputs.release_version }}-win64.zip asset_content_type: application/zip - name: Download spp-cli-linux64 artifact @@ -304,5 +310,5 @@ jobs: with: upload_url: ${{ steps.createDraft.outputs.upload_url }} asset_path: ./spp-cli-linux64.zip - asset_name: spp-cli-${{ needs.buildOnLinux.outputs.version }}-linux64.zip + asset_name: spp-cli-${{ needs.buildOnLinux.outputs.release_version }}-linux64.zip asset_content_type: application/zip From cc851b6d79ecf36098ca33d7368b189306545f42 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Mon, 30 May 2022 13:51:15 +0400 Subject: [PATCH 2/2] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c41b055..76c02ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,6 +133,7 @@ jobs: outputs: version: ${{ steps.properties.outputs.version }} + release_version: ${{ steps.properties.outputs.release_version }} steps: - uses: actions/checkout@v2 - uses: ayltai/setup-graalvm@v1