Skip to content

Commit

Permalink
Merge branch 'main' into set-webpacker-precompile-to-false
Browse files Browse the repository at this point in the history
  • Loading branch information
wwahammy committed Sep 9, 2023
2 parents d98df2f + 9928c7f commit ce2bad5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ concurrency:
cancel-in-progress: true
jobs:
build:
name: "Build"
uses: "./.github/workflows/single-matrix-pr.yml"
with:
os: ${{ matrix.os }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/single-matrix-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
filters: .github/path-filters.yml

package-download:
name: "Package caching"
uses: "./.github/workflows/cache-packages.yml"
needs: changes
with:
Expand All @@ -46,7 +47,8 @@ jobs:
- name: Run markdownlint
run: yarn markdownlint

main_build:
ruby_build:
name: "Ruby build and spec"
needs:
- package-download
- changes
Expand Down Expand Up @@ -75,6 +77,7 @@ jobs:
run: WEBPACKER_PRECOMPILE=f bin/rails assets:precompile

webpack:
name: "Webpack JS files"
needs: package-download
if: ${{ contains(needs.changes.outputs.filters, 'build-js') }}
runs-on: ${{ inputs.os }}
Expand All @@ -94,6 +97,7 @@ jobs:
run: yarn build-storybook

jest:
name: "Jest for JS"
needs: package-download
if: ${{ contains(needs.changes.outputs.filters, 'build-js') }}
runs-on: ${{ inputs.os }}
Expand Down

0 comments on commit ce2bad5

Please sign in to comment.