Skip to content

Commit 514773f

Browse files
committed
chore: green up macos & windows CI
1 parent 69fcc5e commit 514773f

File tree

5 files changed

+79
-12
lines changed

5 files changed

+79
-12
lines changed

.bazelrc

+21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22
# https://github.com/bazelbuild/rules_nodejs/issues/3695
33
common --noenable_bzlmod
44

5+
# Specifies desired output mode for running tests.
6+
# Valid values are
7+
# 'summary' to output only test status summary
8+
# 'errors' to also print test logs for failed tests
9+
# 'all' to print logs for all tests
10+
# 'streamed' to output logs for all tests in real time
11+
# (this will force tests to be executed locally one at a time regardless of --test_strategy value).
12+
common --test_output=errors
13+
14+
# Turn on --incompatible_strict_action_env which was on by default
15+
# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
16+
# https://github.com/bazelbuild/bazel/issues/7026 for more details.
17+
# This flag is needed to so that the bazel cache is not invalidated
18+
# when running bazel via `yarn bazel`.
19+
# See https://github.com/angular/angular/issues/27514.
20+
common --incompatible_strict_action_env
21+
22+
# Turn off legacy external runfiles
23+
# This prevents accidentally depending on this feature, which Bazel will remove.
24+
common --nolegacy_external_runfiles
25+
526
# Load any settings specific to the current user.
627
# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
728
# This needs to be last statement in this

e2e/nodejs_host/.bazelrc

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Specifies desired output mode for running tests.
2+
# Valid values are
3+
# 'summary' to output only test status summary
4+
# 'errors' to also print test logs for failed tests
5+
# 'all' to print logs for all tests
6+
# 'streamed' to output logs for all tests in real time
7+
# (this will force tests to be executed locally one at a time regardless of --test_strategy value).
8+
common --test_output=errors
9+
10+
# Turn on --incompatible_strict_action_env which was on by default
11+
# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
12+
# https://github.com/bazelbuild/bazel/issues/7026 for more details.
13+
# This flag is needed to so that the bazel cache is not invalidated
14+
# when running bazel via `yarn bazel`.
15+
# See https://github.com/angular/angular/issues/27514.
16+
common --incompatible_strict_action_env
17+
18+
# Turn off legacy external runfiles
19+
# This prevents accidentally depending on this feature, which Bazel will remove.
20+
common --nolegacy_external_runfiles

e2e/nodejs_host/MODULE.bazel

+6
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ use_repo(
2626
node,
2727
"node16",
2828
"node16_darwin_amd64",
29+
"node16_darwin_arm64",
2930
"node16_linux_amd64",
31+
"node16_linux_arm64",
3032
"node16_nvmrc",
3133
"node16_nvmrc_darwin_amd64",
34+
"node16_nvmrc_darwin_arm64",
3235
"node16_nvmrc_linux_amd64",
36+
"node16_nvmrc_linux_arm64",
3337
"node16_nvmrc_toolchains",
3438
"node16_nvmrc_windows_amd64",
3539
"node16_toolchains",
3640
"node16_windows_amd64",
3741
"nodejs",
3842
"nodejs_darwin_amd64",
43+
"nodejs_darwin_arm64",
3944
"nodejs_linux_amd64",
45+
"nodejs_linux_arm64",
4046
"nodejs_toolchains",
4147
"nodejs_windows_amd64",
4248
)

e2e/smoke/.bazelrc

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Specifies desired output mode for running tests.
2+
# Valid values are
3+
# 'summary' to output only test status summary
4+
# 'errors' to also print test logs for failed tests
5+
# 'all' to print logs for all tests
6+
# 'streamed' to output logs for all tests in real time
7+
# (this will force tests to be executed locally one at a time regardless of --test_strategy value).
8+
common --test_output=errors
9+
10+
# Turn on --incompatible_strict_action_env which was on by default
11+
# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
12+
# https://github.com/bazelbuild/bazel/issues/7026 for more details.
13+
# This flag is needed to so that the bazel cache is not invalidated
14+
# when running bazel via `yarn bazel`.
15+
# See https://github.com/angular/angular/issues/27514.
16+
common --incompatible_strict_action_env
17+
18+
# Turn off legacy external runfiles
19+
# This prevents accidentally depending on this feature, which Bazel will remove.
20+
common --nolegacy_external_runfiles

e2e/smoke/BUILD.bazel

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
33
load("@bazel_skylib//rules:write_file.bzl", "write_file")
44
load(":defs.bzl", "my_nodejs")
55

6+
not_windows = select({
7+
# There isn't a published rosetta binary for windows as of Feb 2024
8+
"@platforms//os:windows": ["@platforms//:incompatible"],
9+
"//conditions:default": [],
10+
})
11+
612
# Trivial test fixture: a nodejs program that writes to a file
713
write_file(
814
name = "js",
@@ -67,10 +73,8 @@ diff_test(
6773
name = "test_genrule",
6874
file1 = "expected",
6975
file2 = "actual1",
70-
tags = [
71-
# diff_test has line endings issues on Windows
72-
"skip-on-bazelci-windows",
73-
],
76+
# diff_test has line endings issues on Windows
77+
target_compatible_with = not_windows,
7478
)
7579

7680
# Here, my_nodejs is a fake for something like nodejs_binary or
@@ -129,10 +133,8 @@ diff_test(
129133
name = "test_acorn",
130134
file1 = "actual2",
131135
file2 = "expected_ast.json",
132-
tags = [
133-
# diff_test has line endings issues on Windows
134-
"skip-on-bazelci-windows",
135-
],
136+
# diff_test has line endings issues on Windows
137+
target_compatible_with = not_windows,
136138
)
137139

138140
################################################
@@ -177,10 +179,8 @@ diff_test(
177179
name = "test_require_acorn",
178180
file1 = "actual3",
179181
file2 = "expected_ast.json",
180-
tags = [
181-
# diff_test has line endings issues on Windows
182-
"skip-on-bazelci-windows",
183-
],
182+
# diff_test has line endings issues on Windows
183+
target_compatible_with = not_windows,
184184
)
185185

186186
################################################

0 commit comments

Comments
 (0)