Skip to content

Commit

Permalink
[CI]: Add homebrew paths to cabal.project for the recent macos-14 run…
Browse files Browse the repository at this point in the history
…ners (#1920)

* [CI]: Add homebrew paths to cabal.project for the recent macos-14 runners.

* play around
  • Loading branch information
ak3n authored May 10, 2024
1 parent 0dbbf78 commit ef9e165
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/applications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu-')
run: sudo chown -R $USER /usr/local/.ghcup
- name: Install GHC and Cabal
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
ghc: ["9.6.4"]
cabal: ["3.10"]
os: ["macOS-latest"]
os: ["macos-14-large"]
cabalcache: ["true"]

steps:
Expand All @@ -29,7 +29,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu-')
run: sudo chown -R $USER /usr/local/.ghcup
- name: Install GHC and Cabal
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand All @@ -40,9 +40,7 @@ jobs:
- name: Install non-Haskell dependencies (macOS)
if: contains(matrix.os, 'mac')
run: |
brew update && brew install gflags llvm gnu-tar snappy zstd lz4 || true
# work around bug in macOS and github actions cache (cf. https://github.com/actions/cache/issues/403)
echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
brew update && brew install gflags llvm snappy || true
- name: Create cabal.project.local
run: |
cat > cabal.project.local <<EOF
Expand Down
4 changes: 4 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ if os(darwin)
extra-include-dirs:
/opt/local/include
/usr/local/opt/openssl/include
/opt/homebrew/include
/opt/homebrew/opt/openssl/include
extra-lib-dirs:
/opt/local/lib
/usr/local/opt/openssl/lib/
/opt/homebrew/lib
/opt/homebrew/opt/openssl/lib

-- -------------------------------------------------------------------------- --
-- Package Specific Build Settings
Expand Down

0 comments on commit ef9e165

Please sign in to comment.