From a5d6b968edd1c7ea4a34355997c71df8ae73a5e6 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Mon, 3 Feb 2025 21:03:32 +0300 Subject: [PATCH 1/2] install bz2 with apt --- .github/workflows/workflow.yml | 4 ++++ stack-lts-22.yaml | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 stack-lts-22.yaml diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 22197df..5c6c58e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,6 +24,9 @@ jobs: - os: ubuntu-latest stack-yaml: stack-lts-21.yaml # GHC 9.4 extra-args: "" + - os: ubuntu-latest + stack-yaml: stack-lts-22.yaml # GHC 9.6 + extra-args: "" - os: ubuntu-latest stack-yaml: stack-nightly.yaml extra-args: "" @@ -39,6 +42,7 @@ jobs: shell: bash run: | set -ex + sudo apt-get -y install libbz2-dev stack upgrade stack --version stack test --fast --stack-yaml=${{ matrix.stack-yaml }} ${{ matrix.extra-args }} diff --git a/stack-lts-22.yaml b/stack-lts-22.yaml new file mode 100644 index 0000000..8e3ecd8 --- /dev/null +++ b/stack-lts-22.yaml @@ -0,0 +1,3 @@ +resolver: lts-22.43 +packages: +- '.' From daf048d0ad3ae7cc7cd9d71478c5f4822f741f64 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Wed, 5 Feb 2025 21:37:28 +0300 Subject: [PATCH 2/2] Bump GHC versions --- .github/workflows/workflow.yml | 9 +++------ stack-lts-21.yaml | 2 +- stack-lts-23.yaml | 3 +++ xlsx.cabal | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 stack-lts-23.yaml diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5c6c58e..0c0e4cf 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -13,10 +13,7 @@ jobs: matrix: include: - os: ubuntu-latest - stack-yaml: stack-lts-19.yaml # GHC 9.0 - extra-args: "" - - os: ubuntu-latest - stack-yaml: stack-lts-19.yaml + stack-yaml: stack-lts-20.yaml extra-args: "--flag xlsx:microlens" - os: ubuntu-latest stack-yaml: stack-lts-20.yaml # GHC 9.2 @@ -27,8 +24,8 @@ jobs: - os: ubuntu-latest stack-yaml: stack-lts-22.yaml # GHC 9.6 extra-args: "" - - os: ubuntu-latest - stack-yaml: stack-nightly.yaml + - os: ubuntu-latest # GHC 9.8 + stack-yaml: stack-lts-23.yaml extra-args: "" steps: - name: Clone project diff --git a/stack-lts-21.yaml b/stack-lts-21.yaml index 6d39956..c28b116 100644 --- a/stack-lts-21.yaml +++ b/stack-lts-21.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.1 +resolver: lts-21.25 packages: - '.' diff --git a/stack-lts-23.yaml b/stack-lts-23.yaml new file mode 100644 index 0000000..afd0f67 --- /dev/null +++ b/stack-lts-23.yaml @@ -0,0 +1,3 @@ +resolver: lts-23.7 +packages: +- '.' diff --git a/xlsx.cabal b/xlsx.cabal index 90b9c90..bc7c82d 100644 --- a/xlsx.cabal +++ b/xlsx.cabal @@ -27,7 +27,7 @@ Maintainer: qrilka@gmail.com Category: Codec Build-type: Simple -Tested-with: GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.5, GHC == 9.6.2 +Tested-with: GHC == 9.2.8, GHC == 9.4.8, GHC == 9.6.6, GHC == 9.8.4 Cabal-version: >=1.10 Flag microlens