From f4d363a7ae39fe5743b3ceaecc25affd4326e5dc Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Fri, 20 Sep 2024 22:59:20 +0200 Subject: [PATCH 1/2] Add dependency bounds to testsuite to pass cabal check --- hasktags.cabal | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hasktags.cabal b/hasktags.cabal index 5e60e44..561a3c0 100644 --- a/hasktags.cabal +++ b/hasktags.cabal @@ -119,12 +119,12 @@ Test-Suite testsuite hs-source-dirs: src, tests default-language: Haskell2010 Build-Depends: - base - , bytestring - , directory + base >= 4.9 && < 5 + , bytestring >= 0.9 && < 0.13 + , directory >= 1.2.6 && < 1.4 , filepath - , json - , microlens-platform + , json >= 0.5 && < 0.12 + , microlens-platform >= 0.3.8.0 && < 0.5 , utf8-string , HUnit other-modules: Tags, Hasktags, DebugShow From 778e1782d8cb5066c2a94d296c29c9331521b7e3 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 19 Sep 2024 20:39:03 +0200 Subject: [PATCH 2/2] Bump CI to GHC 9.10.1 --- .github/workflows/haskell-ci.yml | 38 +++++++++----------------------- hasktags.cabal | 4 ++-- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index db3a19b..5f6bb79 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.20240416 +# version: 0.19.20240703 # -# REGENDATA ("0.19.20240416",["github","hasktags.cabal"]) +# REGENDATA ("0.19.20240703",["github","hasktags.cabal"]) # 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.20240413 + - compiler: ghc-9.10.1 compilerKind: ghc - compilerVersion: 9.10.0.20240413 + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.2 @@ -42,9 +42,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 @@ -101,9 +101,8 @@ 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) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -121,12 +120,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.3.0 -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 + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -155,18 +154,6 @@ 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: $_ installed\n" unless /^(hasktags)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hasktags)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/hasktags.cabal b/hasktags.cabal index 561a3c0..8492755 100644 --- a/hasktags.cabal +++ b/hasktags.cabal @@ -19,9 +19,9 @@ Category: Development build-type: Simple tested-with: - GHC == 9.10.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