Skip to content

Commit 879db63

Browse files
committed
start updating for integration tests
1 parent 7db5b74 commit 879db63

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ common --incompatible_disallow_struct_provider_syntax
2323
# Windows makes use of runfiles for some rules
2424
build --enable_runfiles
2525

26-
# Make Bazel 6 use bzlmod by default
26+
# Make Bazel 7 use bzlmod by default
2727
common --enable_bzlmod
2828

2929
# Additional config to use for readthedocs builds.
@@ -33,6 +33,6 @@ build:rtd --stamp
3333
# Some bzl files contain repos only available under bzlmod
3434
build:rtd --enable_bzlmod
3535

36-
common:bazel7.x --incompatible_python_disallow_native_rules
36+
common --incompatible_python_disallow_native_rules
3737

3838
build --lockfile_mode=update

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ repos:
4646
- id: update-deleted-packages
4747
name: Update deleted packages
4848
language: system
49-
entry: bazel run @rules_bazel_integration_test//tools:update_deleted_packages
49+
entry: env USE_BAZEL_VERSION=7.x bazel run @rules_bazel_integration_test//tools:update_deleted_packages
5050
files: ^((examples|tests)/.*/(MODULE.bazel|WORKSPACE|WORKSPACE.bzlmod|BUILD.bazel)|.bazelrc)$
5151
pass_filenames: false

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ bazel_binaries.local(
150150
name = "self",
151151
path = "tests/integration/bazel_from_env",
152152
)
153-
bazel_binaries.download(version = "6.4.0")
154-
bazel_binaries.download(version = "7.4.0")
153+
bazel_binaries.download(version = "7.4.1")
154+
bazel_binaries.download(version = "8.0.0")
155155

156156
# For now, don't test with rolling, because that's Bazel 9, which is a ways
157157
# away.
@@ -162,8 +162,8 @@ use_repo(
162162
# These don't appear necessary, but are reported as direct dependencies
163163
# that should be use_repo()'d, so we add them as requested
164164
"bazel_binaries_bazelisk",
165-
"build_bazel_bazel_6_4_0",
166-
"build_bazel_bazel_7_4_0",
165+
"build_bazel_bazel_7_4_1",
166+
"build_bazel_bazel_8_0_0",
167167
# "build_bazel_bazel_rolling",
168168
"build_bazel_bazel_self",
169169
)

tests/integration/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _GAZELLE_PLUGIN_FLAGS = [
3636
]
3737

3838
default_test_runner(
39-
name = "bazel_6_4_workspace_test_runner",
39+
name = "bazel_7_4_workspace_test_runner",
4040
bazel_cmds = [
4141
"info {}".format(" ".join(_LEGACY_WORKSPACE_FLAGS)),
4242
"test {} //...".format(" ".join(_LEGACY_WORKSPACE_FLAGS)),
@@ -45,7 +45,7 @@ default_test_runner(
4545
)
4646

4747
default_test_runner(
48-
name = "bazel_6_4_workspace_test_runner_gazelle_plugin",
48+
name = "bazel_7_4_workspace_test_runner_gazelle_plugin",
4949
bazel_cmds = [
5050
"info {}".format(" ".join(_LEGACY_WORKSPACE_FLAGS + _WORKSPACE_GAZELLE_PLUGIN_FLAGS)),
5151
"test {} //...".format(" ".join(_LEGACY_WORKSPACE_FLAGS + _WORKSPACE_GAZELLE_PLUGIN_FLAGS)),

0 commit comments

Comments
 (0)