From b6d7261d33fce8a009dad9ad2165d5caa06b8eaf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 12:59:09 +0000 Subject: [PATCH 1/2] Update dependency rules_nixpkgs_core to v0.13.0 --- examples/MODULE.bazel | 2 +- rules_haskell_tests/MODULE.bazel | 2 +- .../tests/bzlmod_runfiles/other_module/MODULE.bazel | 2 +- tutorial/MODULE.bazel | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index 10f781fdd..d7338f0e2 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -5,7 +5,7 @@ module( bazel_dep( name = "rules_nixpkgs_core", - version = "0.12.0", + version = "0.13.0", ) bazel_dep( name = "rules_haskell_nix", diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel index d60cb6783..cffcd2058 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -5,7 +5,7 @@ module( bazel_dep( name = "rules_nixpkgs_core", - version = "0.12.0", + version = "0.13.0", ) bazel_dep( name = "rules_haskell_nix", diff --git a/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel b/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel index 6147a7a7c..6fb0c4335 100644 --- a/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel +++ b/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel @@ -13,7 +13,7 @@ bazel_dep( ) bazel_dep( name = "rules_nixpkgs_core", - version = "0.12.0", + version = "0.13.0", ) bazel_dep( name = "platforms", diff --git a/tutorial/MODULE.bazel b/tutorial/MODULE.bazel index 4c97ccde3..7d665f874 100644 --- a/tutorial/MODULE.bazel +++ b/tutorial/MODULE.bazel @@ -15,5 +15,5 @@ bazel_dep( ) bazel_dep( name = "rules_nixpkgs_core", - version = "0.12.0", + version = "0.13.0", ) From e3cb0186dda3b74575bbab660d97b4b832c883a1 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Sun, 2 Feb 2025 14:28:02 +0100 Subject: [PATCH 2/2] Use `ubuntu-22.04` for GitHub actions explicitly After GitHub switching `ubuntu-latest` to Ubuntu 24.04 our CI workflow broke. --- .github/workflows/patch-test.yaml | 6 +++--- .github/workflows/prepare-release.yaml | 2 +- .github/workflows/publish.yaml | 2 +- .github/workflows/update-ghc.yaml | 2 +- .github/workflows/workflow.yaml | 8 ++++---- examples/primitive/.github/workflows/ci.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/patch-test.yaml b/.github/workflows/patch-test.yaml index a5b7abdb1..1261ab62d 100644 --- a/.github/workflows/patch-test.yaml +++ b/.github/workflows/patch-test.yaml @@ -13,7 +13,7 @@ env: jobs: find-ghc-version: name: Find GHC versions for which a bindist is provided - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: ghc-matrix: ${{ steps.set-ghc-versions.outputs.ghc-matrix }} steps: @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, windows-latest] + os: [ubuntu-22.04, macos-13, windows-latest] ghc-version: ${{ fromJSON(needs.find-ghc-version.outputs.ghc-matrix) }} runs-on: ${{ matrix.os }} steps: @@ -39,7 +39,7 @@ jobs: sudo apt-get update sudo apt-get install --no-install-recommends -yy libtinfo5 sudo apt-get clean - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} - uses: actions/checkout@v4 - name: Mount Bazel cache uses: actions/cache@v4 diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml index d308ddffa..7619bb0ff 100644 --- a/.github/workflows/prepare-release.yaml +++ b/.github/workflows/prepare-release.yaml @@ -15,7 +15,7 @@ permissions: jobs: release: name: Prepare Release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Check version run: | diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d48991e1e..a0dc2c2e3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,7 +8,7 @@ on: jobs: webpage: name: Update webpage - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/update-ghc.yaml b/.github/workflows/update-ghc.yaml index f050e192b..31bbcc29f 100644 --- a/.github/workflows/update-ghc.yaml +++ b/.github/workflows/update-ghc.yaml @@ -7,7 +7,7 @@ on: jobs: update_ghc: name: GHC ${{ matrix.ghc }} Update - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index b6eb9942b..e2157c586 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -18,7 +18,7 @@ concurrency: jobs: lint: name: Format & Lint - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: tweag/configure-bazel-remote-cache-auth@v0 @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: [ubuntu-22.04, 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-13, windows-latest] + os: [ubuntu-22.04, macos-13, windows-latest] module: [rules_haskell, rules_haskell_tests] bzlmod: [true, false] ghc: @@ -253,7 +253,7 @@ jobs: path: logs all_ci_tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: - lint - test-nixpkgs diff --git a/examples/primitive/.github/workflows/ci.yml b/examples/primitive/.github/workflows/ci.yml index 378945fab..f45c7b66c 100644 --- a/examples/primitive/.github/workflows/ci.yml +++ b/examples/primitive/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6'] include: - os: windows-latest @@ -23,7 +23,7 @@ jobs: - os: macOS-latest ghc: 'latest' ## Already covered by '9.4' - # - os: ubuntu-latest + # - os: ubuntu-22.04 # ghc: 'latest' steps: - uses: actions/checkout@v3