Skip to content

Commit 220c7f9

Browse files
authored
Merge branch 'master' into cb/fix-ghc-update
2 parents 101769a + 7220749 commit 220c7f9

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/patch-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
os: [ubuntu-latest, macos-12, windows-latest]
33+
os: [ubuntu-latest, macos-13, windows-latest]
3434
ghc-version: ${{ fromJSON(needs.find-ghc-version.outputs.ghc-matrix) }}
3535
runs-on: ${{ matrix.os }}
3636
steps:

.github/workflows/workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
os: [ubuntu-latest, macos-12]
46+
os: [ubuntu-latest, macos-13]
4747
module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
4848
bzlmod: [true, false]
4949
ghc:
@@ -139,7 +139,7 @@ jobs:
139139
strategy:
140140
fail-fast: false
141141
matrix:
142-
os: [ubuntu-latest, macos-12, windows-latest]
142+
os: [ubuntu-latest, macos-13, windows-latest]
143143
module: [rules_haskell, rules_haskell_tests]
144144
bzlmod: [true, false]
145145
ghc:

rules_haskell_tests/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bazel_dep(
7373
)
7474
bazel_dep(
7575
name = "aspect_bazel_lib",
76-
version = "2.8.1",
76+
version = "2.9.4",
7777
)
7878
bazel_dep(
7979
name = "rules_proto",

rules_haskell_tests/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2828
# For testing if bzlmod is enabled
2929
http_archive(
3030
name = "aspect_bazel_lib",
31-
sha256 = "688354ee6beeba7194243d73eb0992b9a12e8edeeeec5b6544f4b531a3112237",
32-
strip_prefix = "bazel-lib-2.8.1",
33-
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.8.1/bazel-lib-v2.8.1.tar.gz",
31+
sha256 = "349aabd3c2b96caeda6181eb0ae1f14f2a1d9f3cd3c8b05d57f709ceb12e9fb3",
32+
strip_prefix = "bazel-lib-2.9.4",
33+
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.9.4/bazel-lib-v2.9.4.tar.gz",
3434
)
3535

3636
# bazel dependencies

0 commit comments

Comments
 (0)