From f1474756b8322297cb9960b0148ab6c7c1e699f7 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 17 Apr 2024 08:54:40 +0800 Subject: [PATCH 1/5] Update haskell workflow Adjust to node 20 instead of 16. --- .github/workflows/haskell.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 1b615b4d0..c87a65c20 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -5,6 +5,7 @@ on: branches: [ "**" ] push: branches: [ "master" ] + workflow_dispatch: jobs: whitespace: @@ -18,7 +19,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Trailing whitespace check if: matrix.os != 'windows-latest' @@ -56,7 +57,7 @@ jobs: with: use-sodium-vrf: false # default is true - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cabal update run: cabal update @@ -125,7 +126,7 @@ jobs: run: cabal build -f+checktvarinvariants -f+checkmvarinvariants strict-checked-vars - name: Save Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Build & test logs path: | @@ -147,7 +148,7 @@ jobs: # # - name: Setup tmate session # if: ${{ failure() }} - # uses: mxschmitt/action-tmate@v3 + # uses: mxschmitt/action-tmate@v4 # with: # limit-access-to-actor: true From 1341361318ad4b8b5ec8f750dd6157806dc4b432 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 17 Apr 2024 09:05:17 +0800 Subject: [PATCH 2/5] Drop ghc 9.2 We only need 8.10, 9.6 and 9.8. --- .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 c87a65c20..beef66581 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.2.7", "9.6.4", "9.8.1"] + ghc: ["8.10.7", "9.6.4", "9.8.1"] os: [ubuntu-latest, macos-latest, windows-latest] env: From ef5dcbf9ed506d34a1f607a507b1ed65e8ab2e22 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 17 Apr 2024 09:06:54 +0800 Subject: [PATCH 3/5] Better artifact log key --- .github/workflows/haskell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index beef66581..871925985 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -125,10 +125,10 @@ jobs: - name: Build strict-checked-vars with invariants run: cabal build -f+checktvarinvariants -f+checkmvarinvariants strict-checked-vars - - name: Save Artifact + - name: Save logs uses: actions/upload-artifact@v4 with: - name: Build & test logs + name: ${{ matrix.ghc }} Build & test logs path: | dist-newstyle/**/*.log From daa6c3f1ce4b760a594518e84768f6a099b7c32e Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 17 Apr 2024 09:32:14 +0800 Subject: [PATCH 4/5] 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 871925985..c2061ea54 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -128,7 +128,7 @@ jobs: - name: Save logs uses: actions/upload-artifact@v4 with: - name: ${{ matrix.ghc }} Build & test logs + name: ${{ runner.os }}-${{ matrix.ghc }} Build & test logs path: | dist-newstyle/**/*.log From b45c1e253b7f83b42440c0c8fc468d4e2f25dfe4 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 17 Apr 2024 09:33:14 +0800 Subject: [PATCH 5/5] Update .github/workflows/haskell.yml Co-authored-by: Alexey Kuleshevich --- .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 c2061ea54..f18fdab4a 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.6.4", "9.8.1"] + ghc: ["8.10.7", "9.2.8", "9.6.4", "9.8.2"] os: [ubuntu-latest, macos-latest, windows-latest] env: