Skip to content
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

Jump to bottom

chore: upgrade to bazel 7 #2107

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

chore: upgrade to bazel 7 #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cffb921
chore: upgrade to Bazel 7
cgrindel Jan 9, 2024
51558b1
Update nix config to use bazel_7
cgrindel Jan 9, 2024
e0ba8bc
Update the commit for nixpkgs.
cgrindel Jan 9, 2024
460fec0
Fix the SHA256 value.
cgrindel Jan 9, 2024
e20234e
Upgrade GHC 9.6.2 to 9.6.3.
cgrindel Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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.4.0
7.0.0
10 changes: 5 additions & 5 deletions .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
ghc:
- 9.2.8
- 9.4.6
- 9.6.2
- 9.6.3
exclude:
- module: rules_haskell_nix

Expand All @@ -58,7 +58,7 @@ jobs:
# and stack config per GHC version
- ghc: 9.4.6
bzlmod: true
- ghc: 9.6.2
- ghc: 9.6.3
bzlmod: true
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -145,16 +145,16 @@ jobs:
ghc:
- 9.2.8
- 9.4.6
- 9.6.2
- 9.6.3
exclude:
# TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
# and stack config per GHC version
- ghc: 9.4.6
bzlmod: true
- ghc: 9.6.2
- ghc: 9.6.3
bzlmod: true
# currently proto-lens-protoc fails with an access violation on Windows
- ghc: 9.6.2
- ghc: 9.6.3
os: windows-latest
env:
GHC_VERSION: ${{ matrix.ghc }}
Expand Down
2 changes: 1 addition & 1 deletion haskell/private/versions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SUPPORTED_BAZEL_VERSIONS = [
]

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

def _parse_version_chunk(version_chunk):
Expand Down
6 changes: 3 additions & 3 deletions nixpkgs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ ... }@args:
let
# 2023-11-30
sha256 = "sha256:06m9r85brk6pcghm63ksl2zsx9j1kbagic3fx2p656z20v1bd48z";
rev = "781e2a9797ecf0f146e81425c822dca69fe4a348";
# 2024-01-09
sha256 = "sha256:1y4mcj6w08ns5151rdc85gv53kbwzcj6avp603cvjgkf98szhlwc";
rev = "a6671578ffa6336bfd1238f1b2a00662b5ab1b34";
in
import (fetchTarball {
inherit sha256;
Expand Down
2 changes: 1 addition & 1 deletion rules_haskell_tests/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,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_0_0",
"build_bazel_bazel_6_3_2",
"build_bazel_bazel_6_4_0",
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 python39Packages.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 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 python39Packages.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