@@ -120,32 +120,6 @@ jobs:
120120 echo "No test.sh in ${PWD}; skipping"
121121 fi
122122
123- # Ubuntu smoke test for e2e/bzlmod with hoist_runfiles_to_exec_cfg=true to verify
124- # that the flag-controlled opt-in path works correctly.
125- test-hoist-runfiles :
126- runs-on : ubuntu-22.04
127- defaults :
128- run :
129- working-directory : e2e/bzlmod
130- env :
131- ASPECT_RULES_JS_FROZEN_PNPM_LOCK : 1
132- steps :
133- - uses : actions/checkout@v6
134-
135- -
uses :
bazel-contrib/[email protected] 136- with :
137- bazelisk-cache : true
138- disk-cache : hoist-runfiles-bzlmod
139- repository-cache : true
140-
141- - name : bazel test //... with hoist_runfiles_to_exec_cfg=true
142- run : |
143- bazel test \
144- --test_tag_filters=-skip-on-bazel7 \
145- --build_tag_filters=-skip-on-bazel7 \
146- --@aspect_rules_js//js:_hoist_runfiles_to_exec_cfg=true \
147- //...
148-
149123 # Mac/Windows smoke tests - only e2e/bzlmod
150124 # Only run on main branch (not PRs) to minimize minutes (billed at 10X and 2X respectively)
151125 # https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#included-storage-and-minutes
@@ -181,12 +155,12 @@ jobs:
181155 # For branch protection settings, this job provides a "stable" name that can be used to gate PR merges
182156 # on "all matrix jobs were successful".
183157 conclusion :
184- needs : [test, smoke, test-hoist-runfiles ]
158+ needs : [test, smoke]
185159 runs-on : ubuntu-latest
186160 if : always()
187161 steps :
188162 - run : |
189- if [[ "${{ needs.test.result }}" == "success" && ("${{ needs.smoke.result }}" == "success" || "${{ needs.smoke.result }}" == "skipped") && "${{ needs.test-hoist-runfiles.result }}" == "success" ]]; then
163+ if [[ "${{ needs.test.result }}" == "success" && ("${{ needs.smoke.result }}" == "success" || "${{ needs.smoke.result }}" == "skipped") ]]; then
190164 exit 0
191165 else
192166 exit 1
0 commit comments