From 2d6e7a3385526410146e2817fcba3de88b5fc6a8 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 22 Oct 2024 18:43:20 +0200 Subject: [PATCH] Bump Haskell-CI to GHC 9.12.0, bump base --- .github/workflows/haskell-ci.yml | 29 +++++++++++++++++++++++++---- hsc2hs.cabal | 7 ++++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b468f41..0ebea88 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/andreasabel/haskell-ci # -# version: 0.19.20240703 +# version: 0.19.20241021 # -# REGENDATA ("0.19.20240703",["github","hsc2hs.cabal"]) +# REGENDATA ("0.19.20241021",["github","hsc2hs.cabal"]) # name: Haskell-CI on: @@ -32,6 +32,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.12.20241014 + compilerKind: ghc + compilerVersion: 9.12.20241014 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -99,8 +104,9 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + 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) "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: @@ -125,7 +131,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$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: @@ -154,6 +160,18 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + if $HEADHACKAGE; then + cat >> $CABAL_CONFIG <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project + fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hsc2hs)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/hsc2hs.cabal b/hsc2hs.cabal index 3f217cd..91eafed 100644 --- a/hsc2hs.cabal +++ b/hsc2hs.cabal @@ -1,7 +1,7 @@ cabal-version: >=1.10 Name: hsc2hs Version: 0.68.10 -x-revision: 2 +x-revision: 3 Copyright: 2000, Marcin Kowalczyk License: BSD3 @@ -28,6 +28,7 @@ Data-Files: template-hsc.h build-type: Simple tested-with: + GHC == 9.12.0 GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.6 @@ -76,7 +77,7 @@ Executable hsc2hs Other-Extensions: CPP, NoMonomorphismRestriction - Build-Depends: base >= 4.3.0 && < 4.21, + Build-Depends: base >= 4.3.0 && < 4.22, containers >= 0.4.0 && < 0.8, directory >= 1.1.0 && < 1.4, filepath >= 1.2.0 && < 1.6, @@ -97,7 +98,7 @@ test-suite spec other-modules: ATTParser Flags BDD ghc-options: -Wall -threaded type: exitcode-stdio-1.0 - build-depends: base >= 4.3.0 && < 4.21, + build-depends: base >= 4.3.0 && < 4.22, test-framework >= 0.8.2.0 && < 0.9, test-framework-hunit >= 0.3.0.2 && < 0.4, HUnit >= 1.3.1.2 && < 1.4 || >= 1.6.0.0 && < 1.7