diff --git a/.github/workflows/ci-mac-win.yml b/.github/workflows/ci-mac-win.yml index 7e2c251..2b84b15 100644 --- a/.github/workflows/ci-mac-win.yml +++ b/.github/workflows/ci-mac-win.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, macos-latest] - ghc: ['9.6', '9.4', '9.2'] + ghc: ['9.8', '9.6', '9.4'] # Minor versions are determined by setup-haskell. # Use quotes so that the version numbers are not interpreted as floats. include: @@ -49,32 +49,35 @@ jobs: # run: | # ghcup install --set ghc ${{ matrix.ghc }} # ghcup install cabal ${{ matrix.cabal }} - - - name: Environment settings based on the Haskell setup - run: | - export GHC_VER=$(ghc --numeric-version) - export CABAL_VER=$(cabal --numeric-version) - echo "GHC_VER = ${GHC_VER}" - echo "CABAL_VER = ${CABAL_VER}" - echo "GHC_VER=${GHC_VER}" >> ${GITHUB_ENV} - echo "CABAL_VER=${CABAL_VER}" >> ${GITHUB_ENV} - # From now on, use env.{GHC|CABAL}_VER rather than matrix.{ghc|cabal}! + # + # - name: Environment settings based on the Haskell setup + # run: | + # export GHC_VER=$(ghc --numeric-version) + # export CABAL_VER=$(cabal --numeric-version) + # echo "GHC_VER = ${GHC_VER}" + # echo "CABAL_VER = ${CABAL_VER}" + # echo "GHC_VER=${GHC_VER}" >> ${GITHUB_ENV} + # echo "CABAL_VER=${CABAL_VER}" >> ${GITHUB_ENV} + # # From now on, use env.{GHC|CABAL}_VER rather than matrix.{ghc|cabal}! - name: Configure the build plan run: | cabal configure -O0 --enable-tests --enable-benchmarks - - uses: actions/cache@v3 + - uses: actions/cache@v4 name: Cache dependencies id: cache + env: + key: ${{ runner.os }}-cabal-${{ steps.setup-haskell.outputs.cabal-version }}-ghc-${{ steps.setup-haskell.outputs.ghc-version }} with: path: | ${{ steps.setup-haskell.outputs.cabal-store }} # The file `plan.json` contains the build information. - key: ${{ runner.os }}-cabal-01-${{ env.GHC_VER }}-${{ env.CABAL_VER }}-${{ hashFiles('**/plan.json') }} + key: ${{ env.key }}-${{ hashFiles('**/plan.json') }} + restore-keys: ${{ env.key }}- - name: Install dependencies - if: ${{ !steps.cache.outputs.cache-hit }} + if: ${{ steps.cache.outputs.cache-hit != 'true' }} run: | cabal build --only-dependencies diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 638aa49..9ace3fb 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.17.20230928 +# version: 0.18.1.20240316 # -# REGENDATA ("0.17.20230928",["github","MissingH.cabal"]) +# REGENDATA ("0.18.1.20240316",["github","MissingH.cabal"]) # name: Haskell-CI on: @@ -32,19 +32,24 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.8.0.20230919 + - compiler: ghc-9.10.0.20240313 compilerKind: ghc - compilerVersion: 9.8.0.20230919 + compilerVersion: 9.10.0.20240313 setup-method: ghcup - allow-failure: true - - compiler: ghc-9.6.3 + allow-failure: false + - compiler: ghc-9.8.2 + compilerKind: ghc + compilerVersion: 9.8.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.6.4 compilerKind: ghc - compilerVersion: 9.6.3 + compilerVersion: 9.6.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.7 + - compiler: ghc-9.4.8 compilerKind: ghc - compilerVersion: 9.4.7 + compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -65,27 +70,27 @@ jobs: - compiler: ghc-8.8.4 compilerKind: ghc compilerVersion: 8.8.4 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-8.6.5 compilerKind: ghc compilerVersion: 8.6.5 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-8.4.4 compilerKind: ghc compilerVersion: 8.4.4 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-8.2.2 compilerKind: ghc compilerVersion: 8.2.2 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-8.0.2 compilerKind: ghc compilerVersion: 8.0.2 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false - compiler: ghc-7.10.3 compilerKind: ghc @@ -97,23 +102,23 @@ jobs: - name: apt run: | apt-get update - apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev if [ "${{ matrix.setup-method }}" = ghcup ]; then mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false) else apt-add-repository -y 'ppa:hvr/ghc' apt-get update apt-get install -y "$HCNAME" mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$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 cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false) fi env: HCKIND: ${{ matrix.compilerKind }} @@ -133,20 +138,20 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV" else HC=$HCDIR/bin/$HCKIND echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV" fi 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 >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi + if [ $((HCNUMVER >= 91000)) -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: @@ -250,7 +255,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -290,7 +295,7 @@ jobs: if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi - name: save cache - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: always() with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} diff --git a/MissingH.cabal b/MissingH.cabal index 1bcfac1..aa4ef99 100644 --- a/MissingH.cabal +++ b/MissingH.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: MissingH version: 1.6.0.1 -x-revision: 1 +x-revision: 2 build-type: Simple license: BSD3 @@ -11,9 +11,10 @@ maintainer: Andreas Abel license-file: LICENSE tested-with: - GHC == 9.8.0 - GHC == 9.6.3 - GHC == 9.4.7 + GHC == 9.10.0 + GHC == 9.8.2 + GHC == 9.6.4 + GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7 @@ -129,7 +130,7 @@ library , base >= 4.8.0.0 && < 5 , containers >= 0.4.2.1 && < 0.8 , directory >= 1.1.0.2 && < 1.4 - , filepath >= 1.3.0.0 && < 1.5 + , filepath >= 1.3.0.0 && < 1.6 , hslogger >= 1.3.0.0 && < 1.4 , mtl >= 1.1.1.0 && < 2.4 , old-locale == 1.0.* @@ -137,7 +138,7 @@ library , parsec == 3.1.* && (< 3.1.12 || >= 3.1.13) , process >= 1.1.0.1 && < 1.7 , regex-compat >= 0.95.1 && < 0.96 - , time >= 1.4 && < 1.13 + , time >= 1.4 && < 1.15 if flag(network--GE-3_0_0) build-depends: network-bsd >= 2.8.1 && <2.9,