From b26029239e3bf2585bc0dd2851c48918c9b69727 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Fri, 27 Oct 2023 18:51:14 +0300 Subject: [PATCH] GHC-9.8 support --- .github/workflows/haskell-ci.yml | 33 +++++++++++++++++++------------- .github/workflows/simple.yml | 6 +++--- lzma.cabal | 9 +++++---- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index ad69dc9..412c655 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.16 +# version: 0.17.20231010 # -# REGENDATA ("0.16",["github","cabal.project"]) +# REGENDATA ("0.17.20231010",["github","cabal.project"]) # name: Haskell-CI on: @@ -28,19 +28,24 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.6.1 + - compiler: ghc-9.8.1 compilerKind: ghc - compilerVersion: 9.6.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.4 + - compiler: ghc-9.6.3 compilerKind: ghc - compilerVersion: 9.4.4 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.7 + - compiler: ghc-9.4.7 compilerKind: ghc - compilerVersion: 9.2.7 + compilerVersion: 9.4.7 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8 + compilerKind: ghc + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -106,7 +111,7 @@ 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" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) @@ -115,7 +120,7 @@ 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" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) fi @@ -131,10 +136,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 diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml index 03377b9..24e7d73 100644 --- a/.github/workflows/simple.yml +++ b/.github/workflows/simple.yml @@ -29,17 +29,17 @@ jobs: pkg-config liblzma --modversion || true - name: Checkout - uses: actions/checkout@v3.0.2 + uses: actions/checkout@v4 - name: Set up Haskell id: setup-haskell - uses: haskell/actions/setup@v1 + uses: haskell/actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} cabal-version: '3.8.1.0' - name: Cache - uses: actions/cache@v2.1.3 + uses: actions/cache@v3 with: path: ${{ steps.setup-haskell.outputs.cabal-store }} key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} diff --git a/lzma.cabal b/lzma.cabal index 2027a73..99497f6 100644 --- a/lzma.cabal +++ b/lzma.cabal @@ -1,6 +1,7 @@ cabal-version: >=1.10 name: lzma version: 0.0.1.0 +x-revision: 1 synopsis: LZMA/XZ compression and decompression homepage: https://github.com/hvr/lzma @@ -13,7 +14,7 @@ copyright: (c) 2015, Herbert Valerio Riedel stability: experimental category: Codec, Compression build-type: Simple -tested-with: GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.5, GHC==8.8.4, GHC==8.10.7, GHC==9.0.2, GHC==9.2.7, GHC==9.4.4, GHC==9.6.1 +tested-with: GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.5, GHC==8.8.4, GHC==8.10.7, GHC==9.0.2, GHC==9.2.8, GHC==9.4.7, GHC==9.6.3, GHC==9.8.1 description: This package provides a pure interface for compressing and decompressing @@ -52,8 +53,8 @@ library exposed-modules: Codec.Compression.Lzma other-modules: LibLzma - build-depends: base >=4.5 && <4.19 - , bytestring >=0.9.2 && <0.12 + build-depends: base >=4.5 && <4.20 + , bytestring >=0.9.2 && <0.13 if os(windows) build-depends: lzma-clib @@ -83,7 +84,7 @@ test-suite lzma-tests -- additional dependencies that require version bounds build-depends: HUnit >= 1.2 && <1.7 , QuickCheck >= 2.8 && <2.15 - , tasty >= 0.10 && <1.5 + , tasty >= 0.10 && <1.6 , tasty-hunit >= 0.9 && <0.11 , tasty-quickcheck >= 0.8.3.2 && <0.11