Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00
Code Issues Projects Releases Wiki Activity

Add step to get Safari Extension branch ref (#1134)

Browse Source
This commit is contained in:
Vince Grassia 2021-11-02 09:26:49 -04:00 committed by GitHub
parent 3ebfc14cbf
commit ecfbf2ba15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/build.yml vendored
View File

@ -30,6 +30,7 @@ jobs:
outputs: outputs:
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 }}
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
@ -40,13 +41,27 @@ jobs:
PKG_VERSION=$(jq -r .version src/package.json) PKG_VERSION=$(jq -r .version src/package.json)
echo "::set-output name=package_version::$PKG_VERSION" echo "::set-output name=package_version::$PKG_VERSION"
- name: Increment version - name: Increment Version
id: increment-version id: increment-version
run: | run: |
BUILD_NUMBER=$(expr 500 + $GITHUB_RUN_NUMBER) BUILD_NUMBER=$(expr 500 + $GITHUB_RUN_NUMBER)
echo "Setting build number to $BUILD_NUMBER" echo "Setting build number to $BUILD_NUMBER"
echo "::set-output name=build_number::$BUILD_NUMBER" echo "::set-output name=build_number::$BUILD_NUMBER"
- name: Get Safari Branch Ref
id: safari-ref
run: |
SAFARI_REF=master
if [ "$GITHUB_REF" = "hotfix" ]; then
SAFARI_REF=hotfix
elif [ "$GITHUB_REF" = "rc" ]; then
SAFARI_REF=rc
fi
echo "Setting Safari Extension ref to $SAFARI_REF"
echo "::set-output name=safari_ref::$SAFARI_REF"
linux: linux:
name: Linux Build name: Linux Build
@ -465,6 +480,7 @@ jobs:
with: with:
repository: 'bitwarden/browser' repository: 'bitwarden/browser'
path: 'dist-safari/browser' path: 'dist-safari/browser'
ref: ${{ needs.setup.outputs.safari_ref }}
- name: Build Safari extension - name: Build Safari extension
shell: pwsh shell: pwsh
@ -612,7 +628,7 @@ jobs:
with: with:
repository: 'bitwarden/browser' repository: 'bitwarden/browser'
path: 'dist-safari/browser' path: 'dist-safari/browser'
ref: ${{ github.ref }} ref: ${{ needs.setup.outputs.safari_ref }}
- name: Build Safari extension - name: Build Safari extension
if: steps.safari-cache.outputs.cache-hit != 'true' if: steps.safari-cache.outputs.cache-hit != 'true'
@ -800,7 +816,7 @@ jobs:
with: with:
repository: 'bitwarden/browser' repository: 'bitwarden/browser'
path: 'dist-safari/browser' path: 'dist-safari/browser'
ref: ${{ github.ref }} ref: ${{ needs.setup.outputs.safari_ref }}
- name: Build Safari extension - name: Build Safari extension
if: steps.safari-cache.outputs.cache-hit != 'true' if: steps.safari-cache.outputs.cache-hit != 'true'
@ -970,6 +986,7 @@ jobs:
with: with:
repository: 'bitwarden/browser' repository: 'bitwarden/browser'
path: 'dist-safari/browser' path: 'dist-safari/browser'
ref: ${{ needs.setup.outputs.safari_ref }}
- name: Build Safari extension - name: Build Safari extension
if: steps.safari-cache.outputs.cache-hit != 'true' if: steps.safari-cache.outputs.cache-hit != 'true'