Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI Haskell fix for macOS build #1908

Merged
merged 2 commits into from
Mar 21, 2023
Merged

CI Haskell fix for macOS build #1908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae3f810
fix macos build
jonaprieto Mar 21, 2023
3ddc80c
Set CC and LIBTOOl vars before trying to build runtime
paulcadman Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,17 +241,11 @@ jobs:
path: main
submodules: true

- name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
run: |
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV

- name: Install ICU4C
run: |
brew install icu4c
brew link icu4c --force


- name: Download and extract wasi-sysroot
run: >
curl
Expand All @@ -277,10 +271,6 @@ jobs:
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV

- name: Add homebrew clang to the PATH (macOS)
run: |
echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH

- name: Make runtime
run: |
cd main
Expand All @@ -292,6 +282,10 @@ jobs:
working-directory: main
test: false

- name: Add homebrew clang to the PATH (macOS)
run: |
echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH

- name: Test suite (macOS)
if: ${{ success() }}
run: |
Expand Down