diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fcf6557..f5a9816 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -6,22 +6,20 @@ # # haskell-ci regenerate # -# For more information, see https://github.com/haskell-CI/haskell-ci +# For more information, see https://github.com/andreasabel/haskell-ci # -# version: 0.16 +# version: 0.17.20231012 # -# REGENDATA ("0.16",["github","deepseq-generics.cabal"]) +# REGENDATA ("0.17.20231012",["github","deepseq-generics.cabal"]) # name: Haskell-CI on: push: branches: - master - - ci* pull_request: branches: - master - - ci* jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -29,7 +27,7 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:bionic + image: buildpack-deps:focal continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: @@ -39,59 +37,14 @@ jobs: compilerVersion: 9.6.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.4 + - compiler: ghc-9.4.7 compilerKind: ghc - compilerVersion: 9.4.4 + compilerVersion: 9.4.7 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.3 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 9.4.3 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.2 - compilerKind: ghc - compilerVersion: 9.4.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.1 - compilerKind: ghc - compilerVersion: 9.4.1 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.7 - compilerKind: ghc - compilerVersion: 9.2.7 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.6 - compilerKind: ghc - compilerVersion: 9.2.6 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.5 - compilerKind: ghc - compilerVersion: 9.2.5 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.4 - compilerKind: ghc - compilerVersion: 9.2.4 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.3 - compilerKind: ghc - compilerVersion: 9.2.3 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.2 - compilerKind: ghc - compilerVersion: 9.2.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.1 - compilerKind: ghc - compilerVersion: 9.2.1 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -99,11 +52,6 @@ jobs: compilerVersion: 9.0.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.0.1 - compilerKind: ghc - compilerVersion: 9.0.1 - setup-method: hvr-ppa - allow-failure: false - compiler: ghc-8.10.7 compilerKind: ghc compilerVersion: 8.10.7 @@ -112,69 +60,40 @@ 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 - allow-failure: false - - compiler: ghc-7.10.3 - compilerKind: ghc - compilerVersion: 7.10.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.8.4 - compilerKind: ghc - compilerVersion: 7.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.6.3 - compilerKind: ghc - compilerVersion: 7.6.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.4.2 - compilerKind: ghc - compilerVersion: 7.4.2 - setup-method: hvr-ppa + setup-method: ghcup allow-failure: false fail-fast: false steps: - name: apt run: | apt-get update - apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 - if [ "${{ matrix.setup-method }}" = ghcup ]; then - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$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) - 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.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - fi + 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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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 ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -186,20 +105,13 @@ jobs: echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER - if [ "${{ matrix.setup-method }}" = ghcup ]; then - HC=$HOME/.ghcup/bin/$HCKIND-$HCVER - 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.10.1.0 -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" - fi - + 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=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.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" @@ -256,7 +168,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: source - name: initial cabal.project for sdist diff --git a/cabal.haskell-ci b/cabal.haskell-ci index e512955..e1f1b77 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1 +1 @@ -branches: master ci* \ No newline at end of file +branches: master diff --git a/deepseq-generics.cabal b/deepseq-generics.cabal index 39a3191..402ac83 100644 --- a/deepseq-generics.cabal +++ b/deepseq-generics.cabal @@ -1,6 +1,6 @@ name: deepseq-generics version: 0.2.0.0 -x-revision: 9 +x-revision: 10 synopsis: GHC.Generics-based Control.DeepSeq.rnf implementation homepage: https://github.com/haskell-hvr/deepseq-generics @@ -16,19 +16,19 @@ cabal-version: >=1.10 tested-with: GHC == 9.6.1 - GHC == 9.4.* - GHC == 9.2.* - GHC == 9.0.* + GHC == 9.4.7 + GHC == 9.2.8 + GHC == 9.0.2 GHC == 8.10.7 GHC == 8.8.4 GHC == 8.6.5 GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - GHC == 7.10.3 - GHC == 7.8.4 - GHC == 7.6.3 - GHC == 7.4.2 + -- GHC == 7.10.3 + -- GHC == 7.8.4 + -- GHC == 7.6.3 + -- GHC == 7.4.2 description: This package provides a "GHC.Generics"-based @@ -62,7 +62,7 @@ library exposed-modules: Control.DeepSeq.Generics build-depends: base >= 4.5 && < 5 , ghc-prim >= 0.2 && < 1 - , deepseq >= 1.2.0.1 && < 1.5 + , deepseq >= 1.2.0.1 && < 1.6 other-extensions: BangPatterns, FlexibleContexts, TypeOperators ghc-options: -Wall