Skip to content

Commit

Permalink
Patch CI to allow for redeployments. Add Github actions to prettier .…
Browse files Browse the repository at this point in the history
…ignore as well. (bitwarden#1352)

* Added inputs for reruns

* Added github workflows to .prettierignore

* Moved the Redeploy logic into the setup job
  • Loading branch information
mimartin12 authored Dec 20, 2021
1 parent 3880d60 commit cc9b9c9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
21 changes: 15 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ name: Release

on:
workflow_dispatch:
inputs: {}
inputs:
release_type:
description: 'Release Options'
required: true
default: 'Initial Release'
type: choice
options:
- Initial Release
- Redeploy

jobs:
setup:
Expand All @@ -24,7 +32,7 @@ jobs:
fi
- name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # 2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # 2.3.4

- name: Check Release Version
id: version
Expand All @@ -34,7 +42,8 @@ jobs:
curl -sL https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | jq -r ".tag_name"
)
if [ "v$version" == "$previous_release_tag_version" ]; then
if [ "v$version" == "$previous_release_tag_version" ] && \
[ "${{ github.event.inputs.release_type }}" == "Initial Release" ]; then
echo "[!] Already released v$version. Please bump version to continue"
exit 1
fi
Expand Down Expand Up @@ -106,7 +115,7 @@ jobs:
_TAG_VERSION: ${{ needs.setup.outputs.tag_version }}
steps:
- name: Checkout Repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
with:
ref: gh-pages

Expand All @@ -116,7 +125,7 @@ jobs:
git push -u origin deploy-$_TAG_VERSION
- name: Checkout Repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4

- name: Setup git config
run: |
Expand All @@ -138,7 +147,7 @@ jobs:
run: unzip web-*-cloud-COMMERCIAL.zip

- name: Deploy GitHub Pages
uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925 # v2.5.0
uses: crazy-max/ghaction-github-pages@db4476a01402e1a7ce05f41832040eef16d14925 # v2.5.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ jslib
src/locales
src/404/*.min.css
src/scripts/u2f.js

# Github Workflows
.github/workflows

0 comments on commit cc9b9c9

Please sign in to comment.