From 4f3a783aec80dd18daf178c033f39dc3c53d49ce Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 14 Nov 2024 14:50:40 +0100 Subject: [PATCH 1/2] CI: Migrate away from macos-12 runners The macos-12 runners are deprecated and will be removed soon. See https://github.com/actions/runner-images/issues/10721 --- .github/workflows/patch-test.yaml | 2 +- .github/workflows/workflow.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/patch-test.yaml b/.github/workflows/patch-test.yaml index d20909adf..a5b7abdb1 100644 --- a/.github/workflows/patch-test.yaml +++ b/.github/workflows/patch-test.yaml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-latest, macos-13, windows-latest] ghc-version: ${{ fromJSON(needs.find-ghc-version.outputs.ghc-matrix) }} runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 7c0a20909..89365b96e 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12] + os: [ubuntu-latest, macos-13] module: [rules_haskell, rules_haskell_nix, rules_haskell_tests] bzlmod: [true, false] ghc: @@ -139,7 +139,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-latest, macos-13, windows-latest] module: [rules_haskell, rules_haskell_tests] bzlmod: [true, false] ghc: From 66d298d498244ea182f014413214f3f7050701b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:02:56 +0000 Subject: [PATCH 2/2] Update dependency aspect_bazel_lib to v2.9.4 --- rules_haskell_tests/MODULE.bazel | 2 +- rules_haskell_tests/WORKSPACE | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel index 923454484..6ef1fbea2 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -73,7 +73,7 @@ bazel_dep( ) bazel_dep( name = "aspect_bazel_lib", - version = "2.8.1", + version = "2.9.4", ) bazel_dep( name = "rules_proto", diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE index 6b3da15a7..4c8343ec6 100644 --- a/rules_haskell_tests/WORKSPACE +++ b/rules_haskell_tests/WORKSPACE @@ -28,9 +28,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # For testing if bzlmod is enabled http_archive( name = "aspect_bazel_lib", - sha256 = "688354ee6beeba7194243d73eb0992b9a12e8edeeeec5b6544f4b531a3112237", - strip_prefix = "bazel-lib-2.8.1", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.8.1/bazel-lib-v2.8.1.tar.gz", + sha256 = "349aabd3c2b96caeda6181eb0ae1f14f2a1d9f3cd3c8b05d57f709ceb12e9fb3", + strip_prefix = "bazel-lib-2.9.4", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.9.4/bazel-lib-v2.9.4.tar.gz", ) # bazel dependencies