From 0b762ec0b46d5ce97b2a515dc7f46e8daa7721ef Mon Sep 17 00:00:00 2001 From: sig <83576392+sigrdrifa@users.noreply.github.com> Date: Sat, 8 Jun 2024 16:56:30 +0100 Subject: [PATCH 1/3] Update haskell.yml --- .github/workflows/haskell.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 26e1e2e..4143bf0 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - uses: actions/setup-haskell@v1 with: ghc-version: '9.4.8' @@ -33,11 +33,15 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - - name: Install dependencies + - name: Install base dependencies + run: | + sudo apt-get update + sudo apt-get install -y libsndfile-dev libsdl2-dev libgirepository1.0-dev libwebkit2gtk-4.0-dev libgtksourceview-3.0-dev libadwaita-1-dev + - name: Install cabal dependencies run: | cabal update - cabal build --only-dependencies --enable-tests --enable-benchmarks + cabal build --only-dependencies --enable-tests --enable-benchmarks exe:audiocate - name: Build - run: cabal build --enable-tests --enable-benchmarks all + run: cabal build --enable-tests --enable-benchmarks exe:audiocate - name: Run tests run: cabal test all From e20c5576e70566d570b2c91e34eed496b45ef73a Mon Sep 17 00:00:00 2001 From: sig <83576392+sigrdrifa@users.noreply.github.com> Date: Sat, 8 Jun 2024 16:57:25 +0100 Subject: [PATCH 2/3] Update haskell.yml --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 4143bf0..9ad430c 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-haskell@v1 with: - ghc-version: '9.4.8' + ghc-version: '9.6.4' cabal-version: '3.6' - name: Cache From 42eb7424f59e859107f85e131279b8ba3db174c2 Mon Sep 17 00:00:00 2001 From: sig <83576392+sigrdrifa@users.noreply.github.com> Date: Sat, 8 Jun 2024 17:01:30 +0100 Subject: [PATCH 3/3] Update haskell.yml --- .github/workflows/haskell.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 9ad430c..a6e7ee1 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -15,10 +15,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-haskell@v1 + - uses: actions/checkout@v4 + - uses: haskell-actions/setup@v2 with: - ghc-version: '9.6.4' + ghc-version: '9.4' cabal-version: '3.6' - name: Cache @@ -33,15 +33,11 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - - name: Install base dependencies - run: | - sudo apt-get update - sudo apt-get install -y libsndfile-dev libsdl2-dev libgirepository1.0-dev libwebkit2gtk-4.0-dev libgtksourceview-3.0-dev libadwaita-1-dev - - name: Install cabal dependencies + - name: Install dependencies run: | cabal update - cabal build --only-dependencies --enable-tests --enable-benchmarks exe:audiocate + cabal build --only-dependencies --enable-tests --enable-benchmarks - name: Build - run: cabal build --enable-tests --enable-benchmarks exe:audiocate + run: cabal build --enable-tests --enable-benchmarks all - name: Run tests - run: cabal test all + run: make test