From 616470d93063f2099be8d623a4fd9f12b8cedd89 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 19 Sep 2024 21:57:47 +0200 Subject: [PATCH] Revision 4: Bump CI to GHC 9.12.0, filepath is relaxed --- .github/workflows/haskell-ci.yml | 27 ++++++++++++++++----------- cabal.haskell-ci | 16 ++++++++-------- resolv.cabal | 11 ++++------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 4387660..da2b331 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.18.1.20240316 +# version: 0.19.20241021 # -# REGENDATA ("0.18.1.20240316",["github","resolv.cabal"]) +# REGENDATA ("0.19.20241021",["github","resolv.cabal"]) # name: Haskell-CI on: @@ -32,9 +32,14 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.10.0.20240313 + - compiler: ghc-9.12.20241014 compilerKind: ghc - compilerVersion: 9.10.0.20240313 + compilerVersion: 9.12.20241014 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.2 @@ -42,9 +47,9 @@ jobs: compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.4 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.4 + compilerVersion: 9.6.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -99,11 +104,11 @@ 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.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -121,12 +126,12 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$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 >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi + 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: @@ -224,7 +229,7 @@ jobs: if $HEADHACKAGE; then echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project fi - $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(binary|resolv)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(resolv)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/cabal.haskell-ci b/cabal.haskell-ci index e097617..e352f23 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,13 +1,13 @@ branches: master -distribution: jammy - -- jammy (Ubuntu 22.04) needed for autoconf-2.71 - -ghcup-jobs: True - -- hvr ppa does not support jammy - -installed: +all -binary - +-- distribution: jammy +-- -- jammy (Ubuntu 22.04) needed for autoconf-2.71 +-- +-- ghcup-jobs: True +-- -- hvr ppa does not support jammy +-- +-- installed: +all -binary +-- -- -- Test core libraries in versions newer than shipped with GHC -- constraint-set containers-0.7 -- constraints: containers >= 0.7 diff --git a/resolv.cabal b/resolv.cabal index 86672ee..d843db8 100644 --- a/resolv.cabal +++ b/resolv.cabal @@ -2,7 +2,7 @@ cabal-version: 2.2 name: resolv version: 0.2.0.2 -x-revision: 3 +x-revision: 4 synopsis: Domain Name Service (DNS) lookup via the libresolv standard library routines description: { @@ -56,9 +56,10 @@ extra-tmp-files: autom4te.cache cbits/hs_resolv_config.h tested-with: - GHC == 9.10.0 + GHC == 9.12.0 + GHC == 9.10.1 GHC == 9.8.2 - GHC == 9.6.4 + GHC == 9.6.6 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -68,10 +69,6 @@ tested-with: GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - -- Not supported by ghcup: - -- GHC == 7.10.3 - -- GHC == 7.8.4 - -- GHC == 7.6.3 source-repository head type: git