mirror of
https://github.com/bitwarden/browser.git
synced 2024-09-29 04:17:41 +02:00
[workflows] Finishing up the switch from the hotfix-rc/* back to hotfix-rc (#3179)
This commit is contained in:
parent
797938881e
commit
12bca0a597
4
.github/workflows/build-browser.yml
vendored
4
.github/workflows/build-browser.yml
vendored
@ -16,7 +16,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- 'master'
|
- 'master'
|
||||||
- 'rc'
|
- 'rc'
|
||||||
- 'hotfix-rc/**'
|
- 'hotfix-rc'
|
||||||
paths:
|
paths:
|
||||||
- 'apps/browser/**'
|
- 'apps/browser/**'
|
||||||
- 'libs/**'
|
- 'libs/**'
|
||||||
@ -347,7 +347,7 @@ jobs:
|
|||||||
|
|
||||||
trigger-desktop-build:
|
trigger-desktop-build:
|
||||||
name: Trigger desktop build
|
name: Trigger desktop build
|
||||||
if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') || contains(github.ref, 'hotfix-rc') }}
|
if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') || github.ref != 'refs/heads/hotfix-rc' }}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
|
2
.github/workflows/build-cli.yml
vendored
2
.github/workflows/build-cli.yml
vendored
@ -17,7 +17,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- 'master'
|
- 'master'
|
||||||
- 'rc'
|
- 'rc'
|
||||||
- 'hotfix-rc/**'
|
- 'hotfix-rc'
|
||||||
paths:
|
paths:
|
||||||
- 'apps/cli/**'
|
- 'apps/cli/**'
|
||||||
- 'libs/**'
|
- 'libs/**'
|
||||||
|
24
.github/workflows/build-desktop.yml
vendored
24
.github/workflows/build-desktop.yml
vendored
@ -744,19 +744,13 @@ jobs:
|
|||||||
if: steps.build-cache.outputs.cache-hit != 'true'
|
if: steps.build-cache.outputs.cache-hit != 'true'
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Extract branch name
|
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
|
||||||
id: extract_branch
|
|
||||||
shell: bash
|
|
||||||
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
|
|
||||||
|
|
||||||
- name: Download artifact from hotfix-rc
|
- name: Download artifact from hotfix-rc
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
if: github.ref == 'refs/heads/hotfix-rc'
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
branch: ${{ steps.extract_branch.outputs.branch }}
|
branch: hotfix-rc
|
||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from rc
|
- name: Download artifact from rc
|
||||||
@ -769,7 +763,7 @@ jobs:
|
|||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from master
|
- name: Download artifact from master
|
||||||
if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
|
if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
@ -968,19 +962,13 @@ jobs:
|
|||||||
if: steps.build-cache.outputs.cache-hit != 'true'
|
if: steps.build-cache.outputs.cache-hit != 'true'
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Extract branch name
|
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
|
||||||
id: extract_branch
|
|
||||||
shell: bash
|
|
||||||
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
|
|
||||||
|
|
||||||
- name: Download artifact from hotfix-rc
|
- name: Download artifact from hotfix-rc
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
if: github.ref == 'refs/heads/hotfix-rc'
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
branch: ${{ steps.extract_branch.outputs.branch }}
|
branch: hotfix-rc
|
||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from rc
|
- name: Download artifact from rc
|
||||||
@ -993,7 +981,7 @@ jobs:
|
|||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from master
|
- name: Download artifact from master
|
||||||
if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
|
if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
|
2
.github/workflows/build-web.yml
vendored
2
.github/workflows/build-web.yml
vendored
@ -17,7 +17,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- 'master'
|
- 'master'
|
||||||
- 'rc'
|
- 'rc'
|
||||||
- 'hotfix-rc/**'
|
- 'hotfix-rc'
|
||||||
paths:
|
paths:
|
||||||
- 'apps/web/**'
|
- 'apps/web/**'
|
||||||
- 'libs/**'
|
- 'libs/**'
|
||||||
|
4
.github/workflows/release-browser.yml
vendored
4
.github/workflows/release-browser.yml
vendored
@ -31,9 +31,9 @@ jobs:
|
|||||||
- name: Branch check
|
- name: Branch check
|
||||||
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
||||||
run: |
|
run: |
|
||||||
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
|
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc ]]; then
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
|
echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
4
.github/workflows/release-cli.yml
vendored
4
.github/workflows/release-cli.yml
vendored
@ -47,9 +47,9 @@ jobs:
|
|||||||
- name: Branch check
|
- name: Branch check
|
||||||
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
||||||
run: |
|
run: |
|
||||||
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
|
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc ]]; then
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
|
echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
28
.github/workflows/release-desktop-beta.yml
vendored
28
.github/workflows/release-desktop-beta.yml
vendored
@ -25,9 +25,9 @@ jobs:
|
|||||||
|
|
||||||
# - name: Branch check
|
# - name: Branch check
|
||||||
# run: |
|
# run: |
|
||||||
# if [[ "$GITHUB_REF" != "refs/heads/master" ]] && [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
|
# if [[ "$GITHUB_REF" != "refs/heads/master" ]] && [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != "refs/heads/hotfix-rc" ]]; then
|
||||||
# echo "==================================="
|
# echo "==================================="
|
||||||
# echo "[!] Can only release from the 'master', 'rc' or 'hotfix-rc/*' branches"
|
# echo "[!] Can only release from the 'master', 'rc' or 'hotfix-rc' branches"
|
||||||
# echo "==================================="
|
# echo "==================================="
|
||||||
# exit 1
|
# exit 1
|
||||||
# fi
|
# fi
|
||||||
@ -609,19 +609,13 @@ jobs:
|
|||||||
if: steps.build-cache.outputs.cache-hit != 'true'
|
if: steps.build-cache.outputs.cache-hit != 'true'
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Extract branch name
|
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
|
||||||
id: extract_branch
|
|
||||||
shell: bash
|
|
||||||
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
|
|
||||||
|
|
||||||
- name: Download artifact from hotfix-rc
|
- name: Download artifact from hotfix-rc
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
if: github.ref == 'refs/heads/hotfix-rc')
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
branch: ${{ steps.extract_branch.outputs.branch }}
|
branch: hotfix-rc
|
||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from rc
|
- name: Download artifact from rc
|
||||||
@ -634,7 +628,7 @@ jobs:
|
|||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from master
|
- name: Download artifact from master
|
||||||
if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
|
if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
@ -815,19 +809,13 @@ jobs:
|
|||||||
if: steps.build-cache.outputs.cache-hit != 'true'
|
if: steps.build-cache.outputs.cache-hit != 'true'
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Extract branch name
|
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
|
||||||
id: extract_branch
|
|
||||||
shell: bash
|
|
||||||
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
|
|
||||||
|
|
||||||
- name: Download artifact from hotfix-rc
|
- name: Download artifact from hotfix-rc
|
||||||
if: contains(github.ref, 'hotfix-rc')
|
if: github.ref == 'refs/heads/hotfix-rc')
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
branch: ${{ steps.extract_branch.outputs.branch }}
|
branch: hotfix-rc
|
||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from rc
|
- name: Download artifact from rc
|
||||||
@ -840,7 +828,7 @@ jobs:
|
|||||||
path: ${{ github.workspace }}/browser-build-artifacts
|
path: ${{ github.workspace }}/browser-build-artifacts
|
||||||
|
|
||||||
- name: Download artifact from master
|
- name: Download artifact from master
|
||||||
if: ${{ github.ref != 'refs/heads/rc' && !contains(github.ref, 'hotfix-rc') }}
|
if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }}
|
||||||
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39 # v2.19.0
|
||||||
with:
|
with:
|
||||||
workflow: build-browser.yml
|
workflow: build-browser.yml
|
||||||
|
4
.github/workflows/release-desktop.yml
vendored
4
.github/workflows/release-desktop.yml
vendored
@ -42,9 +42,9 @@ jobs:
|
|||||||
- name: Branch check
|
- name: Branch check
|
||||||
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
||||||
run: |
|
run: |
|
||||||
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
|
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc ]]; then
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
|
echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
4
.github/workflows/release-web.yml
vendored
4
.github/workflows/release-web.yml
vendored
@ -28,9 +28,9 @@ jobs:
|
|||||||
- name: Branch check
|
- name: Branch check
|
||||||
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
|
||||||
run: |
|
run: |
|
||||||
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != refs/heads/hotfix-rc/* ]]; then
|
if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ $GITHUB_REF != "refs/heads/hotfix-rc" ]]; then
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
echo "[!] Can only release from the 'rc' or 'hotfix-rc/*' branches"
|
echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user