From 4151235686bb5dcc670c4cd181f56b9ce1c5e9f7 Mon Sep 17 00:00:00 2001 From: Douglas Burke Date: Mon, 18 Nov 2024 16:58:07 -0500 Subject: [PATCH] Bump the testing versions Add recent GHC and drop older ones as I do not have the time/energy. --- .github/workflows/hvega-ci.yml | 19 ++++++++++++------- hvega/stack.yaml | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/hvega-ci.yml b/.github/workflows/hvega-ci.yml index 5ade5cea..c2314e57 100644 --- a/.github/workflows/hvega-ci.yml +++ b/.github/workflows/hvega-ci.yml @@ -26,19 +26,19 @@ jobs: cabal: ["latest"] os: [ubuntu-latest] - ghc-version: ["9.6", "9.4", "9.2", "9.0", "8.10"] + ghc-version: ["9.10", "9.8", "9.6", "9.4"] include: - os: macOS-latest - ghc-version: '9.4' + ghc-version: '9.6' - os: windows-latest - ghc-version: '9.4' + ghc-version: '9.6' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main' - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal name: Setup Haskell with: @@ -84,6 +84,11 @@ jobs: run: | cabal test all + #- name: Cabal check + # working-directory: ./hvega + # run: | + # cabal check + # test the hvega/stack.yaml setup (so need to keep the versions up to date) stack: name: stack / ghc ${{ matrix.ghc }} @@ -91,13 +96,13 @@ jobs: strategy: matrix: stack: ["latest"] - ghc: ["9.4"] + ghc: ["9.6"] steps: - uses: actions/checkout@v3 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main' - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 name: Setup Haskell Stack with: ghc-version: ${{ matrix.ghc }} diff --git a/hvega/stack.yaml b/hvega/stack.yaml index 6f1e4426..b21148dd 100644 --- a/hvega/stack.yaml +++ b/hvega/stack.yaml @@ -5,4 +5,4 @@ packages: extra-deps: [] -resolver: lts-21.2 +resolver: lts-22.42