fixing the release workflow (#1009)

bitwarden · Jun 2, 2021 · daf641e · daf641e
1 parent c052b7f
commit daf641e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,12 +57,15 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  tag_name: ${{ env.RELEASE_TAG_NAME }}
- release_name: ${{ env.RELEASE_NAME }}
+ release_name: Version ${{ env.RELEASE_NAME }}
  draft: true
  prerelease: false
 
  ubuntu:
  runs-on: ubuntu-latest
+ needs: setup
+ env:
+ RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
  steps:
  - name: Set up Node
  uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
@@ -133,10 +136,7 @@ jobs:
  docker build -t bitwarden/web .
 
  - name: Tag version
- run: docker tag bitwarden/web bitwarden/web:$($env:RELEASE_TAG_NAME.trimStart('v'))
- shell: pwsh
- env:
- RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+ run: docker tag bitwarden/web bitwarden/web:$RELEASE_VERSION
 
  - name: List Docker images
  run: docker images
@@ -148,10 +148,8 @@ jobs:
  DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-repo-passphrase }}
 
  - name: Push version images
- run: docker push bitwarden/web:$($env:RELEASE_TAG_NAME.trimStart('v'))
- shell: pwsh
+ run: docker push bitwarden/web:$RELEASE_VERSION
  env:
- RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
  DOCKER_CONTENT_TRUST: 1
  DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.retrieve-secrets.outputs.dct-delegate-2-repo-passphrase }}