diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 75b8a44..1739225 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.20240403 +# version: 0.19.20240517 # -# REGENDATA ("0.19.20240403",["github","cabal.project"]) +# REGENDATA ("0.19.20240517",["github","cabal.project"]) # name: Haskell-CI on: @@ -27,14 +27,14 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:focal + image: buildpack-deps:jammy continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.10.0.20240328 + - compiler: ghc-9.10.1 compilerKind: ghc - compilerVersion: 9.10.0.20240328 + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.2 @@ -91,7 +91,6 @@ jobs: 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" 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.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: @@ -116,7 +115,7 @@ jobs: 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 + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -145,18 +144,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <= 0.12.2 allow-newer: containers 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 /^(example-client|hackage-repo-tool|hackage-root-tool|hackage-security|hackage-security-HTTP|hackage-security-curl|hackage-security-http-client|precompute-fileinfo)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(example-client|hackage-repo-tool|hackage-root-tool|hackage-security|hackage-security-HTTP|hackage-security-curl|hackage-security-http-client|precompute-fileinfo)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal index fee6497..7180fe1 100644 --- a/example-client/example-client.cabal +++ b/example-client/example-client.cabal @@ -12,7 +12,7 @@ build-type: Simple cabal-version: >=1.10 tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index 85d1d68..d398c48 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -23,7 +23,7 @@ homepage: https://github.com/haskell/hackage-security bug-reports: https://github.com/haskell/hackage-security/issues tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 diff --git a/hackage-root-tool/hackage-root-tool.cabal b/hackage-root-tool/hackage-root-tool.cabal index d0f2fa7..0b5fd4c 100644 --- a/hackage-root-tool/hackage-root-tool.cabal +++ b/hackage-root-tool/hackage-root-tool.cabal @@ -16,7 +16,7 @@ build-type: Simple cabal-version: >=1.10 tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal index 9f5f2d2..f6ef1d3 100644 --- a/hackage-security-HTTP/hackage-security-HTTP.cabal +++ b/hackage-security-HTTP/hackage-security-HTTP.cabal @@ -18,7 +18,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues build-type: Simple tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 diff --git a/hackage-security-curl/hackage-security-curl.cabal b/hackage-security-curl/hackage-security-curl.cabal index 7e04c5a..54c9ed8 100644 --- a/hackage-security-curl/hackage-security-curl.cabal +++ b/hackage-security-curl/hackage-security-curl.cabal @@ -16,7 +16,7 @@ build-type: Simple cabal-version: >=1.10 tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 diff --git a/hackage-security-http-client/hackage-security-http-client.cabal b/hackage-security-http-client/hackage-security-http-client.cabal index e56cdb5..533463c 100644 --- a/hackage-security-http-client/hackage-security-http-client.cabal +++ b/hackage-security-http-client/hackage-security-http-client.cabal @@ -16,7 +16,7 @@ cabal-version: >=1.10 extra-source-files: ChangeLog.md tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index b4fbdb1..d538f41 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -31,7 +31,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues build-type: Simple tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8 @@ -122,7 +122,7 @@ library -- 0.4.2 introduces TarIndex, 0.4.4 introduces more -- functionality, 0.5.0 changes type of serialise tar >= 0.5 && < 0.7, - template-haskell >= 2.13 && < 2.22, + template-haskell >= 2.13 && < 2.23, time >= 1.8.0.2 && < 1.15, transformers >= 0.3 && < 0.7, zlib >= 0.5 && < 0.8, diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal index 530e4cf..0b5278d 100644 --- a/precompute-fileinfo/precompute-fileinfo.cabal +++ b/precompute-fileinfo/precompute-fileinfo.cabal @@ -15,7 +15,7 @@ build-type: Simple cabal-version: >=1.10 tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.4 GHC == 9.4.8