From cd9cd382fb6fe1b5523a100347c175334a99c0c7 Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Wed, 20 Mar 2024 15:00:46 +0100 Subject: [PATCH] Haskell workflow for liburing > 2.1 && < 2.6 Also: build on ubuntu-20.04 and ubuntu-22.04 --- .github/workflows/haskell.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 34008e0..ce175ad 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -24,7 +24,18 @@ jobs: matrix: ghc: ["9.2.8", "9.4.8", "9.6.4", "9.8.2"] cabal: ["3.10.2.1"] - os: [ubuntu-latest] + os: [ubuntu-latest] # ubuntu-latest = ubuntu-22.04 + liburing: ["liburing-2.5"] + include: + - ghc: "9.6.4" + os: ubuntu-20.04 + liburing: "liburing-2.1" + - ghc: "9.6.4" + os: ubuntu-20.04 + liburing: "liburing-2.5" + - ghc: "9.6.4" + os: ubuntu-22.04 + liburing: "liburing-2.1" steps: - name: Checkout repository @@ -48,7 +59,7 @@ jobs: cd tmp git clone https://github.com/axboe/liburing.git cd liburing - git checkout liburing-2.5 + git checkout ${{ matrix.liburing }} ./configure --cc=gcc --cxx=g++ make -j$(nproc) sudo make install @@ -73,11 +84,10 @@ jobs: cache-name: cache-cabal-build with: path: ${{ steps.setup-haskell.outputs.cabal-store }} - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.liburing }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} restore-keys: | - ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }} - ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}- - ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}- + ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.liburing }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}- + ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.liburing }}-${{ env.cache-name }}- - name: Install cabal dependencies id: build-dependencies