diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index cc1f5c8cce..718ade9a65 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -14,7 +14,6 @@ on: defaults: run: shell: bash - working-directory: apps/browser jobs: cloc: @@ -28,7 +27,7 @@ jobs: run: | sudo apt update sudo apt -y install cloc - + - name: Print lines of code run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git @@ -40,9 +39,6 @@ jobs: repo_url: ${{ steps.gen_vars.outputs.repo_url }} adj_build_number: ${{ steps.gen_vars.outputs.adj_build_number }} steps: - - name: Checkout repo - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 - - name: Get Package Version id: gen_vars run: | @@ -58,6 +54,9 @@ jobs: runs-on: ubuntu-20.04 needs: - setup + defaults: + run: + working-directory: apps/browser steps: - name: Checkout repo uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 @@ -95,6 +94,9 @@ jobs: - locales-test env: _BUILD_NUMBER: ${{ needs.setup.outputs.adj_build_number }} + defaults: + run: + working-directory: apps/browser steps: - name: Checkout repo uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0 @@ -103,7 +105,7 @@ jobs: uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a # v3.0.0 with: cache: 'npm' - cache-dependency-path: '**/package-lock.json' + cache-dependency-path: 'apps/browser/**/package-lock.json' node-version: '16' - name: Print environment @@ -133,7 +135,7 @@ jobs: call 7z a browser-source.zip "Source\*" - name: Upload Opera artifact - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 + uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.0.0 with: name: dist-opera-${{ env._BUILD_NUMBER }}.zip path: apps/browser/dist/dist-opera.zip diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 7afb606890..a03e73f2f0 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -48,7 +48,7 @@ jobs: ### Browser - name: Bump Browser Version - Manifest - if: ${{ github.event.inputs.client == "Browser" }} + if: ${{ github.event.inputs.client == 'Browser' }} uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 with: version: ${{ github.event.inputs.version_number }} @@ -56,7 +56,7 @@ jobs: working-directory: apps/browser - name: Run Prettier after Browser Version Bump - if: ${{ github.event.inputs.client == "Browser" }} + if: ${{ github.event.inputs.client == 'Browser' }} run: | npm install -g prettier prettier --write ./src/manifest.json @@ -64,7 +64,7 @@ jobs: ### CLI - name: Bump CLI Version - Package - if: ${{ github.event.inputs.client == "CLI" }} + if: ${{ github.event.inputs.client == 'CLI' }} uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 with: version: ${{ github.event.inputs.version_number }} @@ -72,7 +72,7 @@ jobs: working-directory: apps/cli - 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 with: version: ${{ github.event.inputs.version_number }} @@ -81,16 +81,16 @@ jobs: ### Desktop - name: Bump Desktop Version - Package - if: ${{ github.event.inputs.client == "Desktop" }} + if: ${{ github.event.inputs.client == 'Desktop' }} uses: bitwarden/gh-actions/version-bump@03ad9a873c39cdc95dd8d77dbbda67f84db43945 with: version: ${{ github.event.inputs.version_number }} file_path: "./src/package.json" working-directory: apps/desktop - + ### Web - 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 with: version: ${{ github.event.inputs.version_number }} @@ -98,7 +98,7 @@ jobs: working-directory: apps/web - 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 with: version: ${{ github.event.inputs.version_number }} @@ -135,6 +135,6 @@ jobs: - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [X] Other - + ## Objective Automated ${{ github.event.inputs.client }} version bump to ${{ github.event.inputs.version_number }}" diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index 53f0d893a8..9fda2eee0a 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -8,4 +8,4 @@ on: jobs: call-workflow: - uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master \ No newline at end of file + uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@master