Skip to content

Commit c75f2ff

Browse files
committed
ci: fix windows testing
1 parent b62813a commit c75f2ff

5 files changed

Lines changed: 57 additions & 11 deletions

File tree

.github/workflows/bazel6.bazelrc

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Not using common here because https://github.com/bazelbuild/bazel/pull/18609 was added in Bazel 6.3.0
2+
13
# Speed up all builds by not checking if external repository files have been modified.
24
# Docs: https://github.com/bazelbuild/bazel/blob/1af61b21df99edc2fc66939cdf14449c2661f873/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java#L244
35
build --noexperimental_check_external_repository_files
@@ -20,8 +22,35 @@ build --noexperimental_action_cache_store_output_metadata
2022
# when local debugging.
2123
# Docs: https://github.com/bazelbuild/bazel/blob/1af61b21df99edc2fc66939cdf14449c2661f873/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java#L185
2224
# NB: This flag is in bazel6.bazelrc as when used in Bazel 7 is has been observed to break
23-
# "build without the bytes" --remote_download_outputs=toplevel. See https://github.com/aspect-build/bazel-lib/pull/711
25+
# "build without the bytes" --remote_download_outputs=toplevel. See https://github.com/bazel-contrib/bazel-lib/pull/711
2426
# for more info.
2527
build --noexperimental_check_output_files
2628
fetch --noexperimental_check_output_files
2729
query --noexperimental_check_output_files
30+
31+
# Don't apply `--noremote_upload_local_results` and `--noremote_accept_cached` to the disk cache.
32+
# If you have both `--noremote_upload_local_results` and `--disk_cache`, then this fixes a bug where
33+
# Bazel doesn't write to the local disk cache as it treats as a remote cache.
34+
# Docs: https://bazel.build/reference/command-line-reference#flag--incompatible_remote_results_ignore_disk
35+
# NB: This flag is in bazel6.bazelrc because it became a no-op in Bazel 7 and has been removed
36+
# in Bazel 8.
37+
build --incompatible_remote_results_ignore_disk
38+
39+
# Propagate tags from a target declaration to the actions' execution requirements.
40+
# Ensures that tags applied in your BUILD file, like `tags=["no-remote"]`
41+
# get propagated to actions created by the rule.
42+
# Without this option, you rely on rules authors to manually check the tags you passed
43+
# and apply relevant ones to the actions they create.
44+
# See https://github.com/bazelbuild/bazel/issues/8830 for details.
45+
# Docs: https://bazel.build/reference/command-line-reference#flag--experimental_allow_tags_propagation
46+
build --experimental_allow_tags_propagation
47+
fetch --experimental_allow_tags_propagation
48+
query --experimental_allow_tags_propagation
49+
50+
# Do not build runfiles symlink forests for external repositories under
51+
# `.runfiles/wsname/external/repo` (in addition to `.runfiles/repo`). This reduces runfiles &
52+
# sandbox creation times & prevents accidentally depending on this feature which may flip to off by
53+
# default in the future. Note, some rules may fail under this flag, please file issues with the rule
54+
# author.
55+
# Docs: https://bazel.build/reference/command-line-reference#flag--legacy_external_runfiles
56+
build --nolegacy_external_runfiles

.github/workflows/bazel7.bazelrc

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
# Speed up all builds by not checking if external repository files have been modified.
22
# Docs: https://github.com/bazelbuild/bazel/blob/1af61b21df99edc2fc66939cdf14449c2661f873/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryOptions.java#L244
3-
build --noexperimental_check_external_repository_files
4-
fetch --noexperimental_check_external_repository_files
5-
query --noexperimental_check_external_repository_files
3+
common --noexperimental_check_external_repository_files
4+
5+
# Don't report when the root module's lower bound for a dependency happens to be less than the resolved version.
6+
# This is expected and should NOT prompt an engineer to update our lower bound to match.
7+
# WARNING: For repository 'aspect_bazel_lib', the root module requires module version aspect_bazel_lib@1.30.2,
8+
# but got aspect_bazel_lib@1.31.2 in the resolved dependency graph.
9+
common --check_direct_dependencies=off
610

711
# Directories used by sandboxed non-worker execution may be reused to avoid unnecessary setup costs.
812
# Save time on Sandbox creation and deletion when many of the same kind of action run during the
913
# build.
1014
# Docs: https://bazel.build/reference/command-line-reference#flag--reuse_sandbox_directories
11-
build --reuse_sandbox_directories
15+
common --reuse_sandbox_directories
16+
17+
# Do not build runfiles symlink forests for external repositories under
18+
# `.runfiles/wsname/external/repo` (in addition to `.runfiles/repo`). This reduces runfiles &
19+
# sandbox creation times & prevents accidentally depending on this feature which may flip to off by
20+
# default in the future. Note, some rules may fail under this flag, please file issues with the rule
21+
# author.
22+
# Docs: https://bazel.build/reference/command-line-reference#flag--legacy_external_runfiles
23+
common --nolegacy_external_runfiles
24+
25+
# The maximum number of attempts to retry if the build encountered a transient remote cache error that would otherwise fail the build.
26+
# Using the same value here than what is the default in Bazel 8 to help with https://github.com/bazelbuild/bazel/issues/22387
27+
# Docs: https://bazel.build/reference/command-line-reference#build-flag--experimental_remote_cache_eviction_retries
28+
common --experimental_remote_cache_eviction_retries=5

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ module(
77
)
88

99
# Lower-bounds (minimum) versions for direct runtime dependencies
10-
bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
10+
bazel_dep(name = "aspect_bazel_lib", version = "2.19.2")
1111
bazel_dep(name = "aspect_rules_js", version = "2.0.0")
12-
bazel_dep(name = "aspect_tools_telemetry", version = "0.2.8")
12+
bazel_dep(name = "aspect_tools_telemetry", version = "0.3.3")
1313
bazel_dep(name = "bazel_skylib", version = "1.5.0")
1414

1515
tel = use_extension("@aspect_tools_telemetry//:extension.bzl", "telemetry")

e2e/smoke_rjs3/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local_path_override(
55
)
66

77
bazel_dep(name = "bazel_lib", version = "3.1.0", dev_dependency = True)
8-
bazel_dep(name = "aspect_rules_js", version = "3.0.0-rc6", dev_dependency = True)
8+
bazel_dep(name = "aspect_rules_js", version = "3.0.2", dev_dependency = True)
99

1010
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
1111
npm.npm_translate_lock(

webpack/dependencies.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ def rules_webpack_dependencies():
1616

1717
http_archive(
1818
name = "aspect_bazel_lib",
19-
sha256 = "6d758a8f646ecee7a3e294fbe4386daafbe0e5966723009c290d493f227c390b",
20-
strip_prefix = "bazel-lib-2.7.7",
21-
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.7/bazel-lib-v2.7.7.tar.gz",
19+
sha256 = "da67c6a785cdc10faf960a22c44501fe6be357a6ebd2bd6101560f9c2a9e06b3",
20+
strip_prefix = "bazel-lib-2.9.0",
21+
url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.0/bazel-lib-v2.9.0.tar.gz",
2222
)
2323

2424
http_archive(

0 commit comments

Comments
 (0)