Commit 4dd57fe
committed
fix(integration): repair make test-integration after config field removal
Removing RepositoryConfig.ExcludeExternalTargets left the Bazel query
always including //external:all-targets, which errors under Bzlmod
("no such package 'external'") since this repo's own config sets
bzlmod_enabled: true. Gate the //external:all-targets clause on
BzlmodEnabled instead, matching the behavior documented in
config/README.md.
Removing ExcludedFiles also dropped the "^@@?bazel_tools/" exclusion
the integration test relied on to skip hashing @bazel_tools' files,
some of which (e.g. tools/test/tw.exe, Windows-only) don't exist on
every OS. Restore the equivalent exclusion via the per-request
RequestOptions.ExtraExcludeFilesRegex, which still exists precisely
for this kind of ad hoc exclusion.1 parent cfceae5 commit 4dd57fe
2 files changed
Lines changed: 19 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
62 | 68 | | |
63 | 69 | | |
64 | 70 | | |
| |||
71 | 77 | | |
72 | 78 | | |
73 | 79 | | |
74 | | - | |
75 | | - | |
76 | 80 | | |
77 | 81 | | |
78 | 82 | | |
| |||
90 | 94 | | |
91 | 95 | | |
92 | 96 | | |
93 | | - | |
| 97 | + | |
94 | 98 | | |
95 | 99 | | |
96 | 100 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
51 | 56 | | |
52 | 57 | | |
53 | 58 | | |
| |||
266 | 271 | | |
267 | 272 | | |
268 | 273 | | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
269 | 277 | | |
270 | 278 | | |
271 | 279 | | |
| |||
361 | 369 | | |
362 | 370 | | |
363 | 371 | | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
364 | 375 | | |
365 | 376 | | |
366 | 377 | | |
| |||
0 commit comments