From 4502782423cb44c9730e9f5ad5d45e46a92df640 Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Tue, 7 Jul 2026 10:14:14 -0400 Subject: [PATCH 1/7] Update haskell-ci GHC versions to match Agda --- agda-stdlib-utils.cabal | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/agda-stdlib-utils.cabal b/agda-stdlib-utils.cabal index e4e4531d2b..895ff660a7 100644 --- a/agda-stdlib-utils.cabal +++ b/agda-stdlib-utils.cabal @@ -12,11 +12,8 @@ tested-with: GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 + GHC == 9.4.2 GHC == 9.2.8 - GHC == 9.0.2 - GHC == 8.10.7 - GHC == 8.8.4 - GHC == 8.6.5 common common-build-parameters default-language: From 832137f9a31f80bff1c0a6d336eb16412e56397e Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Tue, 7 Jul 2026 10:47:29 -0400 Subject: [PATCH 2/7] Regenerate haskell-ci.yml --- .github/workflows/haskell-ci.yml | 37 ++++++++++---------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f94895cd42..fec868b8f8 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20260209 +# version: 0.19.20260624 # -# REGENDATA ("0.19.20260209",["github","--no-cabal-check","agda-stdlib-utils.cabal"]) +# REGENDATA ("0.19.20260624",["github","--no-cabal-check","agda-stdlib-utils.cabal"]) # name: Haskell-CI on: @@ -70,29 +70,14 @@ jobs: compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.8 - compilerKind: ghc - compilerVersion: 9.2.8 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.0.2 - compilerKind: ghc - compilerVersion: 9.0.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.10.7 - compilerKind: ghc - compilerVersion: 8.10.7 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.8.4 + - compiler: ghc-9.4.2 compilerKind: ghc - compilerVersion: 8.8.4 + compilerVersion: 9.4.2 setup-method: ghcup allow-failure: false - - compiler: ghc-8.6.5 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 8.6.5 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false fail-fast: false @@ -185,7 +170,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: path: source - name: initial cabal.project for sdist @@ -213,8 +198,8 @@ jobs: echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + echo "package agda-stdlib-utils" >> cabal.project + echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project cat >> cabal.project <> cabal.project.local @@ -225,7 +210,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -249,7 +234,7 @@ jobs: $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache if: always() - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store From 9dc15135db683d24b18d89df1fc80918689b076a Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Tue, 7 Jul 2026 11:11:04 -0400 Subject: [PATCH 3/7] Fix haskell-ci patch file --- .github/haskell-ci.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/haskell-ci.patch b/.github/haskell-ci.patch index c451df30df..90ed6b8c3b 100644 --- a/.github/haskell-ci.patch +++ b/.github/haskell-ci.patch @@ -18,6 +18,6 @@ + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" - jobs: - linux: - name: Haskell-CI - Linux - ${{ matrix.compiler }} + merge_group: + branches: + - master From dcef7b80cc506567f462f5c24f3c0bc6fa92ad31 Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Tue, 7 Jul 2026 11:11:15 -0400 Subject: [PATCH 4/7] Apply patch to haskell-ci workflow file --- .github/workflows/haskell-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fec868b8f8..69c171ae26 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -18,10 +18,20 @@ on: branches: - master - experimental + paths: + - .github/workflows/haskell-ci.yml + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" pull_request: branches: - master - experimental + paths: + - .github/workflows/haskell-ci.yml + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" merge_group: branches: - master From 1b96a850871a608f914f4852a269025d751bd185 Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Wed, 8 Jul 2026 10:38:28 -0400 Subject: [PATCH 5/7] Remove GHC 9.4.2 from haskell-ci --- agda-stdlib-utils.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/agda-stdlib-utils.cabal b/agda-stdlib-utils.cabal index 895ff660a7..721746dd6e 100644 --- a/agda-stdlib-utils.cabal +++ b/agda-stdlib-utils.cabal @@ -12,7 +12,6 @@ tested-with: GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 - GHC == 9.4.2 GHC == 9.2.8 common common-build-parameters From 86fe28dac98eab19329c09ff77d26e825dc790db Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Wed, 8 Jul 2026 11:15:10 -0400 Subject: [PATCH 6/7] Regenerate haskell-ci --- .github/workflows/haskell-ci.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 69c171ae26..ad6e59296c 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -18,20 +18,10 @@ on: branches: - master - experimental - paths: - - .github/workflows/haskell-ci.yml - - agda-stdlib-utils.cabal - - cabal.haskell-ci - - "*.hs" pull_request: branches: - master - experimental - paths: - - .github/workflows/haskell-ci.yml - - agda-stdlib-utils.cabal - - cabal.haskell-ci - - "*.hs" merge_group: branches: - master @@ -80,11 +70,6 @@ jobs: compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.2 - compilerKind: ghc - compilerVersion: 9.4.2 - setup-method: ghcup - allow-failure: false - compiler: ghc-9.2.8 compilerKind: ghc compilerVersion: 9.2.8 From 76f02b554c74ff305820b1ba88cf5ed99eaa376e Mon Sep 17 00:00:00 2001 From: Silas Hayes-Williams Date: Wed, 8 Jul 2026 11:15:38 -0400 Subject: [PATCH 7/7] Apply haskell-ci patch --- .github/workflows/haskell-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ad6e59296c..0233141a31 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -18,10 +18,20 @@ on: branches: - master - experimental + paths: + - .github/workflows/haskell-ci.yml + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" pull_request: branches: - master - experimental + paths: + - .github/workflows/haskell-ci.yml + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" merge_group: branches: - master