From 46fecccf3378e7ffce2c0463aa1abf0bdd7f6d7a Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 24 Nov 2020 08:25:44 +0100 Subject: [PATCH 1/4] Correct formatting --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 365705f38b..abeae84a59 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,9 +13,9 @@ jobs: - os: ubuntu-latest ghc: '8.10.2.2' # only valid for windows and chocolatey - os: macOS-latest - ghc: '8.10.2.2' # only valid for windows and chocolatey: + ghc: '8.10.2.2' # only valid for windows and chocolatey - os: windows-latest - ghc: '8.10.2' # unusable due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 + ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 - os: windows-latest ghc: '8.8.4' # also fails due to segfault :( - os: windows-latest From 4f3f4c18f4a0761434115496f732a57f18a6cf2f Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 24 Nov 2020 08:26:19 +0100 Subject: [PATCH 2/4] Add ghc-8.10.2.2 to windows build --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41b7d90d0d..d4a1d5cb39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,13 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] + ghc: ['8.10.2.2', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] os: [ubuntu-latest, macOS-latest, windows-latest] exclude: + - os: ubuntu-latest + ghc: '8.10.2.2' # only valid for windows and chocolatey + - os: macOS-latest + ghc: '8.10.2.2' # only valid for windows and chocolatey - os: windows-latest ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 - os: windows-latest From a1a02f78077efb5d72323d175da54ed17f187f39 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 24 Nov 2020 09:34:49 +0100 Subject: [PATCH 3/4] Use always last setup-haskell@v1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4a1d5cb39..e88748fa79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - uses: actions/setup-haskell@v1.1.3 + - uses: actions/setup-haskell@v1 with: ghc-version: ${{ matrix.ghc }} cabal-version: '3.2' From eed310c9fe13d3b54c586bbbca1ab842f60dd8ef Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 24 Nov 2020 09:48:01 +0100 Subject: [PATCH 4/4] Use inclusion instead exclusions --- .github/workflows/build.yml | 9 ++++----- .github/workflows/test.yml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e88748fa79..3230006d87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,13 +16,9 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.2.2', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] + ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] os: [ubuntu-latest, macOS-latest, windows-latest] exclude: - - os: ubuntu-latest - ghc: '8.10.2.2' # only valid for windows and chocolatey - - os: macOS-latest - ghc: '8.10.2.2' # only valid for windows and chocolatey - os: windows-latest ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 - os: windows-latest @@ -31,6 +27,9 @@ jobs: ghc: '8.8.3' # fails due to segfault - os: windows-latest ghc: '8.8.2' # fails due to error with Cabal + include: + - os: windows-latest + ghc: '8.10.2.2' # only available for windows and choco steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index abeae84a59..a948d6e55f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,13 +7,9 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.2.2', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] + ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] os: [ubuntu-latest, macOS-latest, windows-latest] exclude: - - os: ubuntu-latest - ghc: '8.10.2.2' # only valid for windows and chocolatey - - os: macOS-latest - ghc: '8.10.2.2' # only valid for windows and chocolatey - os: windows-latest ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 - os: windows-latest @@ -22,6 +18,9 @@ jobs: ghc: '8.8.3' # fails due to segfault - os: windows-latest ghc: '8.8.2' # fails due to error with Cabal + include: + - os: windows-latest + ghc: '8.10.2.2' # only available for windows and choco steps: - uses: actions/checkout@v2