diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index f7dd3d4b35..e3e510141b 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -69,51 +69,74 @@ jobs: BRANCH_NAME=$(basename ${{ github.ref }}) echo "::set-output name=branch-name::$BRANCH_NAME" + - name: Login to Azure + uses: Azure/login@ec3c14589bd3e9312b3cc8c41e6860e258df9010 + with: + creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} + + - name: Retrieve secrets + id: retrieve-secrets + uses: Azure/get-keyvault-secrets@b5c723b9ac7870c022b8c35befe620b7009b336f + with: + keyvault: "bitwarden-prod-kv" + secrets: "aws-electron-access-id, aws-electron-access-key, aws-electron-bucket-name" + - name: Download all artifacts uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783 with: - workflow: build.yml + workflow: build-desktop.yml workflow_conclusion: success branch: ${{ steps.branch.outputs.branch-name }} + path: ./artifacts - name: Rename .pkg to .pkg.archive env: PKG_VERSION: ${{ steps.retrieve-version.outputs.package_version }} + working-directory: ./artifacts run: mv Bitwarden-${{ env.PKG_VERSION }}-universal.pkg Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive + - name: Publish artifacts to S3 + env: + AWS_ACCESS_KEY_ID: ${{ steps.retrieve-secrets.outputs.aws-electron-access-id }} + AWS_SECRET_ACCESS_KEY: ${{ steps.retrieve-secrets.outputs.aws-electron-access-key }} + AWS_DEFAULT_REGION: 'us-west-2' + AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }} + working-directory: ./artifacts + run: | + aws s3 cp ./ $AWS_S3_BUCKET_NAME/desktop/ \ + --acl "public-read" \ + --recursive \ + --quiet + - name: Create release - if: ${{ github.event.inputs.release_type != 'Dry Run' }} uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09 # v2.8.5 env: PKG_VERSION: ${{ steps.retrieve-version.outputs.package_version }} with: - artifacts: "Bitwarden-${{ env.PKG_VERSION }}-amd64.deb, - Bitwarden-${{ env.PKG_VERSION }}-x86_64.rpm, - Bitwarden-${{ env.PKG_VERSION }}-x64.freebsd, - bitwarden_${{ env.PKG_VERSION }}_amd64.snap, - Bitwarden-${{ env.PKG_VERSION }}-x86_64.AppImage, - latest-linux.yml, - Bitwarden-Portable-${{ env.PKG_VERSION }}.exe, - Bitwarden-Installer-${{ env.PKG_VERSION }}.exe, - Bitwarden-${{ env.PKG_VERSION }}-ia32-store.appx, - Bitwarden-${{ env.PKG_VERSION }}-ia32.appx, - Bitwarden-${{ env.PKG_VERSION }}-ia32.nsis.7z, - Bitwarden-${{ env.PKG_VERSION }}-x64-store.appx, - Bitwarden-${{ env.PKG_VERSION }}-x64.appx, - Bitwarden-${{ env.PKG_VERSION }}-x64.nsis.7z, - Bitwarden-${{ env.PKG_VERSION }}-arm64-store.appx, - Bitwarden-${{ env.PKG_VERSION }}-arm64.appx, - Bitwarden-${{ env.PKG_VERSION }}-arm64.nsis.7z, - bitwarden.${{ env.PKG_VERSION }}.nupkg, - latest.yml, - Bitwarden-${{ env.PKG_VERSION }}-universal-mac.zip, - Bitwarden-${{ env.PKG_VERSION }}-universal.dmg, - Bitwarden-${{ env.PKG_VERSION }}-universal.dmg.blockmap, - latest-mac.yml, - Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive" + artifacts: "artifacts/Bitwarden-${{ env.PKG_VERSION }}-amd64.deb, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-x86_64.rpm, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-x64.freebsd, + artifacts/bitwarden_${{ env.PKG_VERSION }}_amd64.snap, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-x86_64.AppImage, + artifacts/Bitwarden-Portable-${{ env.PKG_VERSION }}.exe, + artifacts/Bitwarden-Installer-${{ env.PKG_VERSION }}.exe, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-ia32-store.appx, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-ia32.appx, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-ia32.nsis.7z, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-x64-store.appx, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-x64.appx, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-x64.nsis.7z, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-arm64-store.appx, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-arm64.appx, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-arm64.nsis.7z, + artifacts/bitwarden.${{ env.PKG_VERSION }}.nupkg, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal-mac.zip, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.dmg, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.dmg.blockmap, + artifacts/Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive" commit: ${{ github.sha }} tag: desktop-v${{ env.PKG_VERSION }} - name: Version ${{ env.PKG_VERSION }} + name: Desktop ${{ env.PKG_VERSION }} body: "" token: ${{ secrets.GITHUB_TOKEN }} draft: true @@ -151,7 +174,7 @@ jobs: - name: Download Snap artifact uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783 with: - workflow: build.yml + workflow: build-desktop.yml workflow_conclusion: success branch: ${{ needs.setup.outputs.branch-name }} artifacts: bitwarden_${{ env._PKG_VERSION }}_amd64.snap @@ -188,7 +211,7 @@ jobs: - name: Download choco artifact uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783 with: - workflow: build.yml + workflow: build-desktop.yml workflow_conclusion: success branch: ${{ needs.setup.outputs.branch-name }} artifacts: bitwarden.${{ env._PKG_VERSION }}.nupkg