diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21ac342..e3ecd61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - name: Get Latest Self-Host Version id: get-self-host - uses: bitwarden/gh-actions/get-release-version@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-release-version@master with: repository: bitwarden/self-host @@ -111,7 +111,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@master with: keyvault: "bitwarden-ci" secrets: "aws-selfhost-version-access-id, @@ -215,7 +215,7 @@ jobs: ########## DockerHub ########## - name: Setup DCT id: setup-dct - uses: bitwarden/gh-actions/setup-docker-trust@082f5e05ed97c3601c6f3179250b1a761c4d647f + uses: bitwarden/gh-actions/setup-docker-trust@master with: azure-creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} azure-keyvault-name: "bitwarden-ci" @@ -252,9 +252,14 @@ jobs: _RELEASE_VERSION: ${{ github.event.inputs.release_version }}-beta # TODO: remove `-beta` after GA steps: ########## DockerHub ########## + - name: Login to Azure - PROD Subscription + uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 + with: + creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} + - name: Setup DCT id: setup-dct - uses: bitwarden/gh-actions/setup-docker-trust@082f5e05ed97c3601c6f3179250b1a761c4d647f + uses: bitwarden/gh-actions/setup-docker-trust@master with: azure-creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} azure-keyvault-name: "bitwarden-ci" @@ -283,12 +288,6 @@ jobs: echo "DOCKER_CONTENT_TRUST=0" >> $GITHUB_ENV ########## ACR PROD ########## - - - name: Login to Azure - PROD Subscription - uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 - with: - creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} - - name: Login to Azure ACR run: az acr login -n ${_AZ_REGISTRY%.azurecr.io}