Update Browser Build Workflow (#2544)

This commit is contained in:
Vince Grassia 2022-05-04 10:59:05 -04:00 committed by GitHub
parent eb4b9bc7b0
commit 186c16b577
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 17 deletions

View File

@ -14,7 +14,6 @@ on:
defaults: defaults:
run: run:
shell: bash shell: bash
working-directory: apps/browser
jobs: jobs:
cloc: cloc:
@ -28,7 +27,7 @@ jobs:
run: | run: |
sudo apt update sudo apt update
sudo apt -y install cloc sudo apt -y install cloc
- name: Print lines of code - name: Print lines of code
run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
@ -40,9 +39,6 @@ jobs:
repo_url: ${{ steps.gen_vars.outputs.repo_url }} repo_url: ${{ steps.gen_vars.outputs.repo_url }}
adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }} adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }}
steps: steps:
- name: Checkout repo
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
- name: Get Package Version - name: Get Package Version
id: gen_vars id: gen_vars
run: | run: |
@ -58,6 +54,9 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: needs:
- setup - setup
defaults:
run:
working-directory: apps/browser
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
@ -95,6 +94,9 @@ jobs:
- locales-test - locales-test
env: env:
_BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }}
defaults:
run:
working-directory: apps/browser
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
@ -103,7 +105,7 @@ jobs:
uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a # v3.0.0 uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a # v3.0.0
with: with:
cache: 'npm' cache: 'npm'
cache-dependency-path: '**/package-lock.json' cache-dependency-path: 'apps/browser/**/package-lock.json'
node-version: '16' node-version: '16'
- name: Print environment - name: Print environment
@ -133,7 +135,7 @@ jobs:
call 7z a browser-source.zip "Source\*" call 7z a browser-source.zip "Source\*"
- name: Upload Opera artifact - name: Upload Opera artifact
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0
with: with:
name: dist-opera-${{ env._BUILD_NUMBER }}.zip name: dist-opera-${{ env._BUILD_NUMBER }}.zip
path: apps/browser/dist/dist-opera.zip path: apps/browser/dist/dist-opera.zip

View File

@ -48,7 +48,7 @@ jobs:
### Browser ### Browser
- name: Bump Browser Version - Manifest - name: Bump Browser Version - Manifest
if: ${{ github.event.inputs.client == "Browser" }} if: ${{ github.event.inputs.client == 'Browser' }}
uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
with: with:
version: ${{ github.event.inputs.version_number }} version: ${{ github.event.inputs.version_number }}
@ -56,7 +56,7 @@ jobs:
working-directory: apps/browser working-directory: apps/browser
- name: Run Prettier after Browser Version Bump - name: Run Prettier after Browser Version Bump
if: ${{ github.event.inputs.client == "Browser" }} if: ${{ github.event.inputs.client == 'Browser' }}
run: | run: |
npm install -g prettier npm install -g prettier
prettier --write ./src/manifest.json prettier --write ./src/manifest.json
@ -64,7 +64,7 @@ jobs:
### CLI ### CLI
- name: Bump CLI Version - Package - name: Bump CLI Version - Package
if: ${{ github.event.inputs.client == "CLI" }} if: ${{ github.event.inputs.client == 'CLI' }}
uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
with: with:
version: ${{ github.event.inputs.version_number }} version: ${{ github.event.inputs.version_number }}
@ -72,7 +72,7 @@ jobs:
working-directory: apps/cli working-directory: apps/cli
- name: Bump CLI Version - Package-lock - name: Bump CLI Version - Package-lock
if: ${{ github.event.inputs.client == "CLI" }} if: ${{ github.event.inputs.client == 'CLI' }}
uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
with: with:
version: ${{ github.event.inputs.version_number }} version: ${{ github.event.inputs.version_number }}
@ -81,16 +81,16 @@ jobs:
### Desktop ### Desktop
- name: Bump Desktop Version - Package - name: Bump Desktop Version - Package
if: ${{ github.event.inputs.client == "Desktop" }} if: ${{ github.event.inputs.client == 'Desktop' }}
uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
with: with:
version: ${{ github.event.inputs.version_number }} version: ${{ github.event.inputs.version_number }}
file_path: "./src/package.json" file_path: "./src/package.json"
working-directory: apps/desktop working-directory: apps/desktop
### Web ### Web
- name: Bump Web Version - package.json - name: Bump Web Version - package.json
if: ${{ github.event.inputs.client == "Web" }} if: ${{ github.event.inputs.client == 'Web' }}
uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
with: with:
version: ${{ github.event.inputs.version_number }} version: ${{ github.event.inputs.version_number }}
@ -98,7 +98,7 @@ jobs:
working-directory: apps/web working-directory: apps/web
- name: Bump Web Version - package-lock.json - name: Bump Web Version - package-lock.json
if: ${{ github.event.inputs.client == "Web" }} if: ${{ github.event.inputs.client == 'Web' }}
uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945
with: with:
version: ${{ github.event.inputs.version_number }} version: ${{ github.event.inputs.version_number }}
@ -135,6 +135,6 @@ jobs:
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps) - [ ] Build/deploy pipeline (DevOps)
- [X] Other - [X] Other
## Objective ## Objective
Automated ${{ github.event.inputs.client }} version bump to ${{ github.event.inputs.version_number }}" Automated ${{ github.event.inputs.client }} version bump to ${{ github.event.inputs.version_number }}"

View File

@ -8,4 +8,4 @@ on:
jobs: jobs:
call-workflow: call-workflow:
uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master