From ab0d55880eb23c8158aa0fdce894a1f2b6462e23 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 28 Aug 2024 13:56:59 +1200 Subject: [PATCH 1/3] Remove windows from CI Windows is not working with CI, so it is temporarily removed. --- .github/workflows/haskell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ccfcf6a..5e45e9b 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -16,7 +16,8 @@ jobs: n: [1] ghc: ["8.10.7"] - os: [ubuntu-latest, macos-latest, windows-latest] + # FIXME: Add windows-latest back to CI once it is passing. + os: [ubuntu-latest, macos-latest] env: # OpenSSL is installed in a non-standard location in MacOS. See From 8779f26ca3357c9778b04c9d3facf4f3123c4360 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 28 Aug 2024 14:03:30 +1200 Subject: [PATCH 2/3] Use haskell-actions/setup in CI This fixes the OSX build for GHC >= 9.2. --- .github/workflows/haskell.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 5e45e9b..216b15c 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -28,6 +28,10 @@ jobs: LD_LIBRARY_PATH: ${{ (matrix.os != 'windows-latest' && '/usr/local/lib') || '' }} steps: + - uses: haskell-actions/setup@v2 + with: + ghc-version: ${{ matrix.ghc }} + - name: "WIN: Install System Dependencies via pacman (msys2)" if: runner.os == 'Windows' run: | @@ -46,7 +50,8 @@ jobs: # this seems to break something. It _must_ come after the pacman setup # above. It appears as if PATHEXT is set _after_ ghcup install ghc/cabal, and # as such we'd need pacman.exe instead. - - name: Setup Haskell + - name: "WIN: Setup Haskell" + if: runner.os == 'Windows' run: | # Use GHCUP to manage ghc/cabal ghcup install ghc --set ${{ matrix.ghc }} From a57e4eb8df9f6d9c27682d75204de4480c2634e8 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 28 Aug 2024 14:04:48 +1200 Subject: [PATCH 3/3] Add more GHC versions to CI --- .github/workflows/haskell.yml | 31 ++++++++++++++++++++++++++++++- HsOpenSSL.cabal | 13 ++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 216b15c..87e9c30 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -15,10 +15,39 @@ jobs: # number instances is a good way to trigger flaky build failures n: [1] - ghc: ["8.10.7"] + ghc: + - "8.0.2" + - "8.2.2" + - "8.4.4" + - "8.6.5" + - "8.8.4" + - "8.10.7" + - "9.0.2" + - "9.2.8" + - "9.4.8" + - "9.6.6" + - "9.8.2" + - "9.10.1" # FIXME: Add windows-latest back to CI once it is passing. os: [ubuntu-latest, macos-latest] + # Action fails to install GHC < 8.10 on OSX with a generic error + # messsage: + # + # Error: All install methods for ghc 8.0.2 failed + # + # On the other hand, 8.10 and 9.0 fail due to LLVM: + # + # Warning: Couldn't figure out LLVM version! + # Make sure you have installed LLVM between [9 and 13) + exclude: + - {ghc: "8.0.2", os: "macos-latest"} + - {ghc: "8.2.2", os: "macos-latest"} + - {ghc: "8.4.4", os: "macos-latest"} + - {ghc: "8.6.5", os: "macos-latest"} + - {ghc: "8.8.4", os: "macos-latest"} + - {ghc: "8.10.7", os: "macos-latest"} + - {ghc: "9.0.2", os: "macos-latest"} env: # OpenSSL is installed in a non-standard location in MacOS. See # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-latest-Readme.md diff --git a/HsOpenSSL.cabal b/HsOpenSSL.cabal index d2d9e42..9990937 100644 --- a/HsOpenSSL.cabal +++ b/HsOpenSSL.cabal @@ -21,7 +21,18 @@ Bug-Reports: https://github.com/haskell-cryptography/HsOpenSSL/issues Category: Cryptography Cabal-Version: 1.12 Tested-With: - GHC==8.8.1, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3 + GHC ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.4 + || ==8.10.7 + || ==9.0.2 + || ==9.2.8 + || ==9.4.8 + || ==9.6.6 + || ==9.8.1 + || ==9.10.1 Build-Type: Custom Extra-Source-Files: AUTHORS