Moving the push of the MAS artifact to the build workflow to enable manual publishing from TestFlight (#1150)

This commit is contained in:
Joseph Flinn 2021-11-09 07:26:30 -08:00 committed by GitHub
parent 4f77f12552
commit d6c100afeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 34 deletions

View File

@ -31,6 +31,8 @@ jobs:
package_version: ${{ steps.retrieve-version.outputs.package_version }} package_version: ${{ steps.retrieve-version.outputs.package_version }}
build_number: ${{ steps.increment-version.outputs.build_number }} build_number: ${{ steps.increment-version.outputs.build_number }}
safari_ref: ${{ steps.safari-ref.outputs.safari_ref }} safari_ref: ${{ steps.safari-ref.outputs.safari_ref }}
rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
@ -62,6 +64,21 @@ jobs:
echo "Setting Safari Extension ref to $SAFARI_REF" echo "Setting Safari Extension ref to $SAFARI_REF"
echo "::set-output name=safari_ref::$SAFARI_REF" echo "::set-output name=safari_ref::$SAFARI_REF"
- name: Check if special branches exist
id: branch-check
run: |
if [[ $(git ls-remote --heads origin rc) ]]; then
echo "::set-output name=rc_branch_exists::1"
else
echo "::set-output name=rc_branch_exists::0"
fi
if [[ $(git ls-remote --heads origin hotfix) ]]; then
echo "::set-output name=hotfix_branch_exists::1"
else
echo "::set-output name=hotfix_branch_exists::0"
fi
linux: linux:
name: Linux Build name: Linux Build
@ -215,9 +232,6 @@ jobs:
run: npm run lint run: npm run lint
- name: Build & Sign (dev) - name: Build & Sign (dev)
run: |
npm run build
npm run pack:win
env: env:
ELECTRON_BUILDER_SIGN: 1 ELECTRON_BUILDER_SIGN: 1
SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }}
@ -225,6 +239,9 @@ jobs:
SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }}
SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }}
SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }}
run: |
npm run build
npm run pack:win
- name: Rename appx files for store - name: Rename appx files for store
shell: pwsh shell: pwsh
@ -640,11 +657,11 @@ jobs:
run: ./scripts/safari-build.ps1 -copyonly run: ./scripts/safari-build.ps1 -copyonly
- name: Build application (dist) - name: Build application (dist)
run: |
npm run pack:mac
env: env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
run: |
npm run pack:mac
- name: Upload .zip artifact - name: Upload .zip artifact
uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3
@ -841,6 +858,18 @@ jobs:
path: ./dist/mas-universal/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.pkg path: ./dist/mas-universal/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.pkg
if-no-files-found: error if-no-files-found: error
- name: Deploy to TestFlight
env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
if: |
(github.ref == 'refs/heads/master'
&& needs.setup.outputs.rc_branch_exists == 0
&& needs.setup.outputs.hotfix_branch_exists == 0)
|| (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
|| github.ref == 'refs/heads/hotfix'
run: npm run upload:mas
macos-package-dev: macos-package-dev:
name: MacOS Package Dev Release Asset name: MacOS Package Dev Release Asset

View File

@ -163,32 +163,3 @@ jobs:
run: | run: |
cd dist cd dist
choco push choco push
macos:
name: Deploy MacOS
runs-on: macos-10.15
needs: setup
env:
_PKG_VERSION: ${{ needs.setup.outputs.package_version }}
steps:
- name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
- name: Make target directory
run: mkdir -p dist/mas-universal
- name: Download Mac artifact
uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
with:
workflow: build.yml
workflow_conclusion: success
branch: ${{ needs.setup.outputs.branch-name }}
artifacts: Bitwarden-${{ env._PKG_VERSION }}-universal.pkg
path: ./dist/mas-universal
- name: Deploy to App Store
run: npm run upload:mas
env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}