From 8936802668becee6f17f8d44f0e2b821ccfde108 Mon Sep 17 00:00:00 2001 From: Dmitrii Kovanikov Date: Sat, 7 Jan 2023 15:48:40 +0000 Subject: [PATCH] Upgrade CI --- .github/workflows/ci.yml | 25 +++++++++++++++++-------- iris.cabal | 9 +++++---- stack.yaml | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea83460..7fdecc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,24 +20,28 @@ jobs: ghc: - "8.10.7" - "9.0.2" - - "9.2.4" - - "9.4.2" + - "9.2.5" + - "9.4.4" exclude: - os: macOS-latest ghc: 8.10.7 - os: macOS-latest ghc: 9.0.2 + - os: macOS-latest + ghc: 9.2.5 - os: windows-latest ghc: 8.10.7 - os: windows-latest ghc: 9.0.2 + - os: windows-latest + ghc: 9.2.5 steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2.0 + - uses: haskell/actions/setup@v2.2 id: setup-haskell-cabal name: Setup Haskell with: @@ -79,13 +83,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - stack: ["2.7.5"] - ghc: ["9.2.4"] + stack: ["2.9.3"] + ghc: ["9.2.5"] steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2.0 + - uses: haskell/actions/setup@v2.2 name: Setup Haskell Stack with: ghc-version: ${{ matrix.ghc }} @@ -114,9 +118,14 @@ jobs: steps: - uses: actions/checkout@v2 + # See: https://github.com/haskell/actions/issues/128 + - name: Fix Ubuntu Runner + run: | + sudo apt-get install -y libncurses5 + - name: Run HLint env: - HLINT_VERSION: "3.2.7" + HLINT_VERSION: "3.5" run: | curl -L https://github.com/ndmitchell/hlint/releases/download/v${HLINT_VERSION}/hlint-${HLINT_VERSION}-x86_64-linux.tar.gz --output hlint.tar.gz tar -xvf hlint.tar.gz @@ -135,7 +144,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2.0 + - uses: haskell/actions/setup@v2.2 id: setup-haskell-cabal name: Setup Haskell with: diff --git a/iris.cabal b/iris.cabal index 56d54c3..37b642c 100644 --- a/iris.cabal +++ b/iris.cabal @@ -16,10 +16,11 @@ category: CLI,Framework build-type: Simple extra-doc-files: README.md CHANGELOG.md -tested-with: GHC == 9.4.2 - GHC == 9.2.4 - GHC == 9.0.2 - GHC == 8.10.7 +tested-with: + GHC == 9.4.4 + GHC == 9.2.5 + GHC == 9.0.2 + GHC == 8.10.7 source-repository head type: git diff --git a/stack.yaml b/stack.yaml index 0b4a0af..f4e23c1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2022-08-04 +resolver: lts-20.5 extra-deps: - colourista-0.1.0.2