From 9020b593df7878c3ed8e37863ad2a1899044aa65 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Thu, 5 Dec 2024 16:09:43 +1100
Subject: [PATCH 1/2] Support ghc 9.12
---
cabal.project | 11 +++++++++++
th-desugar.cabal | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/cabal.project b/cabal.project
index e6fdbad..f810855 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1 +1,12 @@
packages: .
+
+tests: True
+
+if impl (ghc >= 9.12)
+ allow-newer:
+ , splitmix:base
+ , th-abstraction:template-haskell
+ , th-compat:template-haskell
+ , th-expand-syns:template-haskell
+ , th-lift:template-haskell
+ , th-orphans:template-haskell
diff --git a/th-desugar.cabal b/th-desugar.cabal
index ad35aa7..d1d26db 100644
--- a/th-desugar.cabal
+++ b/th-desugar.cabal
@@ -50,7 +50,7 @@ library
build-depends:
base >= 4.9 && < 5,
ghc-prim,
- template-haskell >= 2.11 && < 2.23,
+ template-haskell >= 2.11 && < 2.24,
containers >= 0.5,
mtl >= 2.1 && < 2.4,
ordered-containers >= 0.2.2,
From c73ff6352ab4885f5043f1a65c1162189831bf1e Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Thu, 5 Dec 2024 16:19:18 +1100
Subject: [PATCH 2/2] CI: Add ghc 9.12 to the build matix
---
.github/workflows/haskell-ci.yml | 57 +++++++++++++++++++++-----------
cabal.haskell-ci | 2 +-
2 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index 232c115..79061e7 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -1,6 +1,6 @@
# This GitHub workflow config has been generated by a script via
#
-# haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
+# haskell-ci 'github' '--config=cabal.haskell-ci' 'cabal.project'
#
# To regenerate the script (for example after adjusting tested-with) run
#
@@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
-# version: 0.19.20241021
+# version: 0.19.20241202
#
-# REGENDATA ("0.19.20241021",["--config=cabal.haskell-ci","cabal.project"])
+# REGENDATA ("0.19.20241202",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
@@ -23,15 +23,15 @@ jobs:
timeout-minutes:
60
container:
- image: buildpack-deps:jammy
+ image: buildpack-deps:focal
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- - compiler: ghc-9.12.20241014
+ - compiler: ghc-9.12.0.20241128
compilerKind: ghc
- compilerVersion: 9.12.20241014
- setup-method: ghcup
+ compilerVersion: 9.12.0.20241128
+ setup-method: ghcup-prerelease
allow-failure: false
- compiler: ghc-9.10.1
compilerKind: ghc
@@ -95,41 +95,60 @@ jobs:
allow-failure: false
fail-fast: false
steps:
- - name: apt
+ - name: apt-get install
run: |
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+ - name: Install GHCup
+ run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
- "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
- "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+ - name: Install cabal-install
+ run: |
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+ - name: Install GHC (GHCup)
+ if: matrix.setup-method == 'ghcup'
+ run: |
+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+ echo "HC=$HC" >> "$GITHUB_ENV"
+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- - name: Set PATH and environment variables
+ - name: Install GHC (GHCup prerelease)
+ if: matrix.setup-method == 'ghcup-prerelease'
run: |
- echo "$HOME/.cabal/bin" >> $GITHUB_PATH
- echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
- echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
- echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
- HCDIR=/opt/$HCKIND/$HCVER
+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+ env:
+ HCKIND: ${{ matrix.compilerKind }}
+ HCNAME: ${{ matrix.compiler }}
+ HCVER: ${{ matrix.compilerVersion }}
+ - name: Set PATH and environment variables
+ run: |
+ echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
- echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
@@ -260,8 +279,8 @@ jobs:
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
- uses: actions/cache/save@v4
if: always()
+ uses: actions/cache/save@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index 20c4040..f36304e 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -1 +1 @@
-distribution: jammy
+distribution: focal