Skip to content

Full Bazel 7 support (drop Bazel 6) #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
axman6 wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Full Bazel 7 support (drop Bazel 6) #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9545141
Update shell.nix and .bazelversion to 7.1.0
axman6 Jul 23, 2026
c7807d7
Remove bazel 6 from GitHub matrix
axman6 Jul 23, 2026
b0830cf
Use rules_python's toolchain_type
axman6 Jul 23, 2026
cb88cc1
Remove bazel 6 from versions.bzl
axman6 Jul 23, 2026
683d4ff
Remove bazel 6 from rules_haskell_tests/MODULE.bazel
axman6 Jul 23, 2026
0d2f5a4
REMOVE: Temporary change to force GitHub to notice new commits
axman6 Jul 23, 2026
02f7757
Bump rules_java to 7.6.5 for Bazel 7 compatibility
mrkkrp Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.1.0
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ jobs:
os: [ubuntu-24.04, macos-14, macos-15-intel, windows-2022]
bzlmod: [true, false]
bazel:
- "6.x"
- "7.x"
# - "8.x"
exclude:
# TODO(cb) add full support for Bazel 7
- os: windows-2022
Expand Down
2 changes: 1 addition & 1 deletion haskell/ghc_bindist.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ py_runtime_pair(
toolchain(
name = "toolchain",
toolchain = ":py_runtime_pair",
toolchain_type = "@bazel_tools//tools/python:toolchain_type",
toolchain_type = "@rules_python//python:toolchain_type",
exec_compatible_with = [
"@platforms//cpu:{cpu}",
"@platforms//os:{os}",
Expand Down
3 changes: 0 additions & 3 deletions haskell/private/versions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@
# because every bazel version tested requires a lot of space on CI
# See https://github.com/tweag/rules_haskell/pull/1781#issuecomment-1187640454
SUPPORTED_BAZEL_VERSIONS = [
"6.3.2",
"6.5.0",
"7.1.0",
]

SUPPORTED_NIXPKGS_BAZEL_PACKAGES = [
"bazel_6",
"bazel_7",
]

Expand Down
4 changes: 2 additions & 2 deletions haskell/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ def rules_haskell_dependencies():
maybe(
http_archive,
name = "rules_java",
sha256 = "29ba147c583aaf5d211686029842c5278e12aaea86f66bd4a9eb5e525b7f2701",
sha256 = "8afd053dd2a7b85a4f033584f30a7f1666c5492c56c76e04eec4428bdb2a86cf",
urls = [
"https://github.com/bazelbuild/rules_java/releases/download/6.3.0/rules_java-6.3.0.tar.gz",
"https://github.com/bazelbuild/rules_java/releases/download/7.6.5/rules_java-7.6.5.tar.gz",
],
)

Expand Down
3 changes: 0 additions & 3 deletions rules_haskell_tests/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ non_modules_deps_1 = use_extension("//:non_module_deps_1.bzl", "non_module_deps_
use_repo(
non_modules_deps_1,
"asterius_bundle_linux_amd64",
"bazel_6",
"bazel_7",
"build_bazel_bazel_6_3_2",
"build_bazel_bazel_6_5_0",
"build_bazel_bazel_7_1_0",
"glibc_locales",
"linux_amd64_asterius-toolchain",
Expand Down
2 changes: 1 addition & 1 deletion rules_haskell_tests/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mkShell {
file
] ++ lib.optionals docTools [ graphviz python3Packages.sphinx zip unzip ];

packages = [ bazel_6 ];
packages = [ bazel_7 ];

shellHook = ''
# Add nix config flags to .bazelrc.local.
Expand Down
2 changes: 1 addition & 1 deletion rules_haskell_tests/tests/haskell_import/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extern HsInt add_one_hs(HsInt a0);

int main(int argc, char *argv[]) {
hs_init(&argc, &argv);
printf("Adding one to 5 through Haskell is %ld\n", add_one_hs(5));
printf("Adding one to 5 through Haskell is %" FMT_Int "\n", add_one_hs(5));
hs_exit();
return 0;
}
2 changes: 1 addition & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ mkShell {
++ lib.optionals docTools [ graphviz python3Packages.sphinx zip unzip ]
++ lib.optional stdenv.isDarwin macOS-security;

packages = [ bazel_6 ];
packages = [ bazel_7 ];

shellHook = ''
# Add nix config flags to .bazelrc.local.
Expand Down
Loading