Skip to content

Commit

Permalink
chore: upgrade Bazel to 7.0.0rc4 (#250)
Browse files Browse the repository at this point in the history
Upgrade Bazel to 7.0.0rc4.
  • Loading branch information
cgrindel authored Nov 17, 2023
1 parent 573b6d5 commit 800818f
Show file tree
Hide file tree
Showing 9 changed files with 247 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.0rc3
7.0.0rc4
34 changes: 17 additions & 17 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions examples/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ bazel_integration_test(
name = "simple_test",
bazel_binaries = bazel_binaries,
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":simple_test_runner",
workspace_files = integration_test_utils.glob_workspace_files("simple") + [
"//:shared_bazelrc_files",
Expand All @@ -51,6 +57,12 @@ bazel_integration_test(
name = "legacy_simple_test",
bazel_binaries = bazel_binaries,
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":legacy_simple_test_runner",
workspace_files = integration_test_utils.glob_workspace_files("simple") + [
"//:shared_bazelrc_files",
Expand All @@ -72,6 +84,12 @@ bazel_integration_tests(
name = "simple_test",
bazel_binaries = bazel_binaries,
bazel_versions = _SIMPLE_TEST_VERSIONS,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":simple_test_runner",
workspace_files = integration_test_utils.glob_workspace_files("simple") + [
"//:shared_bazelrc_files",
Expand All @@ -96,6 +114,12 @@ bazel_integration_test(
name = "custom_test_runner_test",
bazel_binaries = bazel_binaries,
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
# GH120: Enable the custom_test_runner test once swift_bazel supports
# bzlmod.
target_compatible_with = select({
Expand Down Expand Up @@ -128,6 +152,12 @@ bazel_integration_test(
name = "use_create_scratch_dir_test",
bazel_binaries = bazel_binaries,
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":use_create_scratch_dir_test_runner",
workspace_files = integration_test_utils.glob_workspace_files("simple") + [
"//:local_repository_files",
Expand All @@ -151,6 +181,12 @@ bazel_integration_test(
name = "dynamic_workspace_test",
bazel_binaries = bazel_binaries,
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":dynamic_workspace_test_runner",
)

Expand Down
6 changes: 6 additions & 0 deletions examples/custom_test_runner/integration_tests/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ bazel_integration_test(
bazel_binaries = bazel_binaries,
# Specify the version of Bazel to use to execute the test.
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
# This is a reference to the custom test runner.
test_runner = "//Sources/CustomTestRunner",
visibility = ["//:__subpackages__"],
Expand Down
6 changes: 6 additions & 0 deletions examples/env_var_with_rootpath/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ bazel_integration_test(
env = {
"SAMPLE_FILE": "$(rootpath @sample_file//file)",
},
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":simple_test_runner",
workspace_path = "sample_workspace",
)
Expand Down
7 changes: 7 additions & 0 deletions release/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ load(
load(
"//bazel_integration_test:defs.bzl",
"bazel_integration_test",
"integration_test_utils",
)

bzlformat_pkg(name = "bzlformat")
Expand Down Expand Up @@ -85,6 +86,12 @@ bazel_integration_test(
name = "archive_test",
bazel_binaries = bazel_binaries,
bazel_version = bazel_binaries.versions.current,
tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS + [
# Avoid file permssion error when using disk and repository cache after
# 7.0.0rc2 upgrade.
# https://github.com/bazelbuild/bazel/issues/19908
"no-sandbox",
],
test_runner = ":archive_test_runner",
visibility = ["//:__subpackages__"],
)
5 changes: 4 additions & 1 deletion tests/e2e_tests/workspace/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ default_test_runner(
bazel_integration_tests(
name = "child_test",
bazel_versions = bazel_binaries.versions.all,
tags = ["exclusive-if-local"],
tags = [
"exclusive-if-local",
"no-sandbox",
],
test_runner = ":child_test_runner",
workspace_path = "child_workspace",
)
Loading

0 comments on commit 800818f

Please sign in to comment.