From 0230bbda633dc525f204f4616674ab662940507f Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Mon, 30 Mar 2026 18:58:03 +0530 Subject: [PATCH 1/2] Use the perf counters GHC for 9.2.8 build --- .github/workflows/haskell.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index c68ca00876..cb407c4778 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -272,6 +272,7 @@ jobs: # WARNING! cannot use # comments inside pack_options. # GHCUP_GHC_OPTIONS="-u https://s3.ap-south-1.amazonaws.com/downloads.portal.composewell.com/ghc/ghc-9.2.8-x86_64-unknown-linux.tar.xz" pack_options: >- + GHCUP_GHC_OPTIONS="-u https://github.com/composewell/ghc/releases/download/ghc-9.2.8-perf-counters-1-rc1/ghc-9.2.8.20231130-x86_64-unknown-linux.tar.xz" CABAL_PROJECT=cabal.project DISABLE_SDIST_BUILD="y" DISABLE_DOCS="y" From 93163b96ef97378cb151501efaec5fd41cd616a1 Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Tue, 31 Mar 2026 16:51:51 +0530 Subject: [PATCH 2/2] Add a mechanism to invalidate ghc cache per matrix entry --- .github/workflows/haskell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index cb407c4778..02778a5b7e 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -269,6 +269,7 @@ jobs: runner: ubuntu-latest command: cabal ghc_version: 9.2.8 + ghc_salt: perf-counter-1 # WARNING! cannot use # comments inside pack_options. # GHCUP_GHC_OPTIONS="-u https://s3.ap-south-1.amazonaws.com/downloads.portal.composewell.com/ghc/ghc-9.2.8-x86_64-unknown-linux.tar.xz" pack_options: >- @@ -365,7 +366,7 @@ jobs: with: path: | ~/.ghcup - key: ${{ matrix.runner }}-ghcup-${{ env.GHCUP_VERSION }}-${{ matrix.ghc_version }} + key: ${{ matrix.runner }}-${{ matrix.ghc_version }}.${{ matrix.ghc_salt}} # XXX If we want to invalidate the cache on resolver change we # should use a separate cache for stack as it should be keyed on