landlock, psx: support GHC 9.6.4 / base ^>=4.18

NicolasT · Mar 31, 2024 · ac68328 · ac68328
1 parent ce186be
commit ac68328
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 55 deletions.
diff --git 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.15.20230227
+# version: 0.19.20240316
 #
-# REGENDATA ("0.15.20230227",["github","cabal.project"])
+# REGENDATA ("0.19.20240316",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -29,11 +29,16 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.0.20230210
+          - compiler: ghc-9.6.4
             compilerKind: ghc
-            compilerVersion: 9.6.0.20230210
+            compilerVersion: 9.6.4
             setup-method: ghcup
-            allow-failure: true
+            allow-failure: false
+          - compiler: ghc-9.6.1
+            compilerKind: ghc
+            compilerVersion: 9.6.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.4.2
             compilerKind: ghc
             compilerVersion: 9.4.2
@@ -61,11 +66,11 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.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.7.yaml;
+          "$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.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -77,16 +82,18 @@ jobs:
           echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
           HCDIR=/opt/$HCKIND/$HCVER
-          HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
+          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=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.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 >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
           echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
@@ -115,18 +122,6 @@ jobs:
           repository hackage.haskell.org
             url: http://hackage.haskell.org/
           EOF
-          if $HEADHACKAGE; then
-          cat >> $CABAL_CONFIG <<EOF
-          repository head.hackage.ghc.haskell.org
-             url: https://ghc.gitlab.haskell.org/head.hackage/
-             secure: True
-             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-             key-threshold: 3
-          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
-          EOF
-          fi
           cat >> $CABAL_CONFIG <<EOF
           program-default-options
             ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -143,28 +138,28 @@ jobs:
       - name: cache (tools)
         uses: actions/cache/restore@v3
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-106d6240
+          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-adb19217
           path: ~/.haskell-ci-tools
       - name: install cabal-plan
         run: |
           mkdir -p $HOME/.cabal/bin
-          curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
-          echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc  cabal-plan.xz' | sha256sum -c -
+          curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
+          echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2  cabal-plan.xz' | sha256sum -c -
           xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
           rm -f cabal-plan.xz
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: install hlint
         run: |
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint  --constraint='hlint >=3.5 && <3.6' |  perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then hlint --version ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint  --constraint='hlint >=3.5 && <3.6' |  perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then hlint --version ; fi
       - name: save cache (tools)
         uses: actions/cache/save@v3
         if: always()
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-106d6240
+          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-adb19217
           path: ~/.haskell-ci-tools
       - name: checkout
         uses: actions/checkout@v3
@@ -203,9 +198,6 @@ jobs:
           constraints: landlock +werror
           constraints: psx +werror
           EOF
-          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 /^(landlock|psx)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
@@ -234,10 +226,10 @@ jobs:
           $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
       - name: hlint
         run: |
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_landlock} && hlint -XHaskell2010 src) ; fi
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_landlock} && hlint -XHaskell2010 internal) ; fi
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_landlock} && hlint -XHaskell2010 bin) ; fi
-          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_psx} && hlint -XHaskell2010 src) ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then (cd ${PKGDIR_landlock} && hlint -XHaskell2010 src) ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then (cd ${PKGDIR_landlock} && hlint -XHaskell2010 internal) ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then (cd ${PKGDIR_landlock} && hlint -XHaskell2010 bin) ; fi
+          if [ $((HCNUMVER >= 90604)) -ne 0 ] ; then (cd ${PKGDIR_psx} && hlint -XHaskell2010 src) ; fi
       - name: cabal check
         run: |
           cd ${PKGDIR_landlock} || false
@@ -256,19 +248,27 @@ jobs:
           rm -f cabal.project.local
       - name: constraint set optparse-applicative-0.17
         run: |
+          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='optparse-applicative ^>=0.17' all --dry-run ; fi
+          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
           if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='optparse-applicative ^>=0.17' --dependencies-only -j2 all ; fi
           if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='optparse-applicative ^>=0.17' all ; fi
       - name: constraint set optparse-applicative-0.16
         run: |
+          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='optparse-applicative ^>=0.16.1.0' all --dry-run ; fi
+          if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
           if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='optparse-applicative ^>=0.16.1.0' --dependencies-only -j2 all ; fi
           if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='optparse-applicative ^>=0.16.1.0' all ; fi
       - name: constraint set unix-2.8
         run: |
+          $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.8' all --dry-run
+          cabal-plan topo | sort
           $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.8' --dependencies-only -j2 all
           $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.8' all
           $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.8' all
       - name: constraint set unix-2.7
         run: |
+          $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.7' all --dry-run
+          cabal-plan topo | sort
           $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.7' --dependencies-only -j2 all
           $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.7' all
           $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='unix ^>=2.7' all

diff --git a/landlock/CHANGELOG.md b/landlock/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Revision history for landlock
 
-## 0.2.1.2 -- YYYY-mm-dd
+## 0.2.2.0 -- YYYY-MM-DD
 
 * Update Cabal file formatting
+* Support GHC 9.6.4 / `base ^>=4.18`
 
 ## 0.2.1.1 -- 2023-02-28
 

diff --git a/landlock/landlock.cabal b/landlock/landlock.cabal
@@ -38,7 +38,7 @@ extra-source-files:
   cbits/linux/landlock.h
 
 tested-with:
-  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1 || ==9.6.4
 
 source-repository head
   type:     git
@@ -77,7 +77,7 @@ library
   import:           common-settings
   exposed-modules:  System.Landlock
   build-depends:
-    , base               >=4.14.2.0 && <4.18
+    , base               >=4.14.2.0 && <4.19
     , exceptions         ^>=0.10.4
     , landlock-internal
     , unix               ^>=2.7.2.2 || ^>=2.8
@@ -100,7 +100,7 @@ library landlock-internal
   include-dirs:       cbits
   c-sources:          cbits/hs-landlock.c
   build-depends:
-    , base        >=4.14.2.0 && <4.18
+    , base        >=4.14.2.0 && <4.19
     , exceptions  ^>=0.10.4
     , psx         ^>=0.1
     , unix        ^>=2.7.2.2 || ^>=2.8
@@ -129,7 +129,7 @@ executable landlocked
   autogen-modules: Paths_landlock
   hs-source-dirs:  bin
   build-depends:
-    , base                  >=4.14.2.0  && <4.18
+    , base                  >=4.14.2.0  && <4.19
     , exceptions            ^>=0.10.4
     , landlock
     , optparse-applicative  ^>=0.16.1.0 || ^>=0.17
@@ -143,7 +143,7 @@ test-suite landlock-test
   other-modules:    ThreadedScenario
   build-depends:
     , async                    ^>=2.2.3
-    , base                     >=4.14.2.0  && <4.18
+    , base                     >=4.14.2.0  && <4.19
     , filepath                 ^>=1.4.2.1
     , landlock
     , landlock-internal
@@ -169,7 +169,7 @@ test-suite landlock-test-threaded
   other-modules:    ThreadedScenario
   build-depends:
     , async        ^>=2.2.3
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , landlock
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3
@@ -184,7 +184,7 @@ test-suite landlock-readme
   other-modules:      ReadmeUtils
   hs-source-dirs:     . test
   build-depends:
-    , base       >=4.14.2.0 && <4.18
+    , base       >=4.14.2.0 && <4.19
     , directory  ^>=1.3.6.0
     , filepath   ^>=1.4.2.1
     , landlock
@@ -204,7 +204,7 @@ test-suite landlocked-test
   hs-source-dirs:     test
   main-is:            landlocked-test.hs
   build-depends:
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , filepath     ^>=1.4.2.1
     , process      ^>=1.6.9.0
     , tasty        ^>=1.4.1

diff --git a/psx/CHANGELOG.md b/psx/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Revision history for psx
 
-## 0.1.1.2 -- YYYY-mm-dd
+## 0.1.2.0 -- YYYY-MM-DD
 
 * Update Cabal file formatting
+* Support GHC 9.6.4 /  `base ^>=4.18`
 
 ## 0.1.1.1 -- 2023-02-28
 

diff --git a/psx/psx.cabal b/psx/psx.cabal
@@ -37,7 +37,7 @@ extra-source-files:
   test/detect-psx.h
 
 tested-with:
-  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1 || ==9.6.4
 
 source-repository head
   type:     git
@@ -86,7 +86,7 @@ library
   -- restrict compatibility with said GHC version(s).
   exposed-modules:  System.PSX
   hs-source-dirs:   src
-  build-depends:    base >=4.14.2.0 && <4.18
+  build-depends:    base >=4.14.2.0 && <4.19
   include-dirs:     cbits
   install-includes: hs-psx.h
   c-sources:        cbits/hs-psx.c
@@ -110,7 +110,7 @@ test-suite psx-test-threaded
   include-dirs:     test
   build-depends:
     , async        ^>=2.2.3
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , psx
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3
@@ -128,7 +128,7 @@ test-suite psx-test
   include-dirs:     test
   build-depends:
     , async        ^>=2.2.3
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , psx
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3
@@ -143,7 +143,7 @@ test-suite psx-test-no-psx
   c-sources:        test/detect-psx.c
   include-dirs:     test cbits
   build-depends:
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3