From 13868439f3f4f1d46b3961272af4482aa7ec3535 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 27 Aug 2023 19:34:23 +0200 Subject: [PATCH 1/2] 0.10.4.2-r7: allow bytestring-0.12 and text-2.1, bump CI to GHC 9.8.0 --- .github/workflows/haskell-ci.yml | 71 ++++++++++++++++++++++++++------ .gitignore | 1 + cabal.haskell-ci | 18 ++++++++ safecopy.cabal | 18 +++----- 4 files changed, 84 insertions(+), 24 deletions(-) create mode 100644 cabal.haskell-ci diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 2955536..d094b9f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,14 +8,18 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.16.4 +# version: 0.17.20230827 # -# REGENDATA ("0.16.4",["github","safecopy.cabal"]) +# REGENDATA ("0.17.20230827",["github","safecopy.cabal"]) # name: Haskell-CI on: - - push - - pull_request + push: + branches: + - master + pull_request: + branches: + - master jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -28,14 +32,19 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.8.0.20230822 + compilerKind: ghc + compilerVersion: 9.8.0.20230822 + setup-method: ghcup + allow-failure: true - compiler: ghc-9.6.2 compilerKind: ghc compilerVersion: 9.6.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.5 + - compiler: ghc-9.4.7 compilerKind: ghc - compilerVersion: 9.4.5 + compilerVersion: 9.4.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -86,8 +95,9 @@ jobs: 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" + 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) else @@ -95,8 +105,9 @@ jobs: 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" + 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 cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) fi env: @@ -111,10 +122,12 @@ jobs: echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER if [ "${{ matrix.setup-method }}" = ghcup ]; then - 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 "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" else HC=$HCDIR/bin/$HCKIND @@ -128,7 +141,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + if [ $((HCNUMVER >= 90800)) -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: @@ -157,6 +170,18 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + if $HEADHACKAGE; then + cat >> $CABAL_CONFIG <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo "package safecopy" >> cabal.project ; fi if [ $((HCNUMVER >= 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 /^(safecopy)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local @@ -245,6 +275,23 @@ jobs: run: | rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: prepare for constraint sets + run: | + rm -f cabal.project.local + - name: constraint set text-2.1 + run: | + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all --dry-run ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' --dependencies-only -j2 all ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi + - name: constraint set bytestring-0.12 + run: | + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all --dry-run ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' --dependencies-only -j2 all ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi - name: save cache uses: actions/cache/save@v3 if: always() diff --git a/.gitignore b/.gitignore index d1dcd98..5ec7c3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +/dist-newstyle/ *.nix \ No newline at end of file diff --git a/cabal.haskell-ci b/cabal.haskell-ci new file mode 100644 index 0000000..2a89036 --- /dev/null +++ b/cabal.haskell-ci @@ -0,0 +1,18 @@ +branches: master +installed: +all + +constraint-set bytestring-0.12 + ghc: >= 8.2 + constraints: bytestring ^>= 0.12 + tests: True + run-tests: True + +constraint-set text-2.1 + ghc: >= 8.2 + constraints: text ^>= 2.1 + tests: True + run-tests: True + +raw-project + allow-newer: bytestring + allow-newer: text \ No newline at end of file diff --git a/safecopy.cabal b/safecopy.cabal index 5ebf4a9..330ac1b 100644 --- a/safecopy.cabal +++ b/safecopy.cabal @@ -1,10 +1,6 @@ --- safecopy.cabal auto-generated by cabal init. For additional --- options, see --- http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html#pkg-descr. --- The name of the package. Name: safecopy Version: 0.10.4.2 -x-revision: 6 +x-revision: 7 Synopsis: Binary serialization with version control. Description: An extension to Data.Serialize with built-in version control. Homepage: https://github.com/acid-state/safecopy @@ -18,8 +14,9 @@ Extra-source-files: CHANGELOG.md Cabal-version: >=1.10 tested-with: + GHC == 9.8.0 GHC == 9.6.2 - GHC == 9.4.5 + GHC == 9.4.7 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7 @@ -43,15 +40,15 @@ Library Hs-Source-Dirs: src/ -- Packages needed in order to build this package. - Build-depends: base >=4.9 && <5, + Build-depends: base >= 4.9 && < 5, array < 0.6, cereal >= 0.5 && < 0.6, - bytestring < 0.12, + bytestring < 0.13, generic-data >= 0.3, containers >= 0.3 && < 0.7, old-time < 1.2, template-haskell < 2.21, - text < 1.3 || >= 2.0 && < 2.1, + text < 1.3 || >= 2.0 && < 2.2, time < 1.13, transformers < 0.7, vector >= 0.10 && < 0.14 @@ -60,9 +57,6 @@ Library Other-modules: Data.SafeCopy.Instances, Data.SafeCopy.SafeCopy, Data.SafeCopy.Derive - -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source. - -- Build-tools: - GHC-Options: -Wall cpp-options: -DDEFAULT_SIGNATURES -DSAFE_HASKELL From 05229e4d5cf0e4ff567e47b1ccd3dcccfd12125d Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 11 Oct 2023 06:39:33 +0200 Subject: [PATCH 2/2] v0.10.4.2-r8: Bump template-haskell, containers; bump CI to GHC 9.8.1 --- .github/workflows/haskell-ci.yml | 37 ++++++++++---------------------- safecopy.cabal | 10 ++++----- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index d094b9f..7dc178e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -6,11 +6,11 @@ # # 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.17.20230827 +# version: 0.17.20231010 # -# REGENDATA ("0.17.20230827",["github","safecopy.cabal"]) +# REGENDATA ("0.17.20231010",["github","safecopy.cabal"]) # name: Haskell-CI on: @@ -27,19 +27,19 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:bionic + image: buildpack-deps:focal continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.8.0.20230822 + - compiler: ghc-9.8.1 compilerKind: ghc - compilerVersion: 9.8.0.20230822 + compilerVersion: 9.8.1 setup-method: ghcup - allow-failure: true - - compiler: ghc-9.6.2 + allow-failure: false + - compiler: ghc-9.6.3 compilerKind: ghc - compilerVersion: 9.6.2 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.7 @@ -141,7 +141,7 @@ jobs: 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 + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -170,18 +170,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(safecopy)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/safecopy.cabal b/safecopy.cabal index 330ac1b..64d907b 100644 --- a/safecopy.cabal +++ b/safecopy.cabal @@ -1,6 +1,6 @@ Name: safecopy Version: 0.10.4.2 -x-revision: 7 +x-revision: 8 Synopsis: Binary serialization with version control. Description: An extension to Data.Serialize with built-in version control. Homepage: https://github.com/acid-state/safecopy @@ -14,8 +14,8 @@ Extra-source-files: CHANGELOG.md Cabal-version: >=1.10 tested-with: - GHC == 9.8.0 - GHC == 9.6.2 + GHC == 9.8.1 + GHC == 9.6.3 GHC == 9.4.7 GHC == 9.2.8 GHC == 9.0.2 @@ -45,9 +45,9 @@ Library cereal >= 0.5 && < 0.6, bytestring < 0.13, generic-data >= 0.3, - containers >= 0.3 && < 0.7, + containers >= 0.3 && < 0.8, old-time < 1.2, - template-haskell < 2.21, + template-haskell < 2.22, text < 1.3 || >= 2.0 && < 2.2, time < 1.13, transformers < 0.7,