Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
newhoggy committed May 1, 2024
1 parent 14a7cbf commit 9231e90
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ jobs:
strategy:
fail-fast: false
matrix:
# If you edit these versions, make sure the version in the lonely macos-latest job below is updated accordingly
ghc: ["9.6.4", "9.8.1"]
cabal: ["3.10.2.1"]
os: [windows-latest, ubuntu-latest]
include:
# Using include, to make sure there will only be one macOS job, even if the matrix gets expanded later on.
# We want a single job, because macOS runners are scarce.
Expand Down Expand Up @@ -70,10 +66,6 @@ jobs:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- name: Install openssl (macos)
if: startsWith(matrix.os, 'macos')
run: brew install openssl

- name: Install ghcup on macos
if: startsWith(matrix.os, 'macos')
shell: bash
Expand All @@ -97,6 +89,15 @@ jobs:
with:
use-sodium-vrf: true # default is true

- name: Install openssl-3.0.13 on macos
if: startsWith(matrix.os, 'macos')
run: |
brew update
brew install openssl@3.0
export PKG_CONFIG_PATH="/opt/homebrew/opt/openssl@3.0/lib/pkgconfig:$PKG_CONFIG_PATH"
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" | tee -a $GITHUB_ENV
pkg-config --libs openssl@3.0
- name: "Re-install openssl on Windows"
if: runner.os == 'Windows'
shell: C:/msys64/usr/bin/bash.exe -e '{0}'
Expand Down

0 comments on commit 9231e90

Please sign in to comment.