From 2e094be176b14c040cbcaf01a7ab77ab6b5864f4 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:19:11 +0200 Subject: [PATCH] install z3 on macos --- .github/workflows/test_nightly_many_os.yml | 1 + ci/basic_nightly_test.sh | 23 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test_nightly_many_os.yml b/.github/workflows/test_nightly_many_os.yml index 53c2e254e5f..c5aaeb06faf 100644 --- a/.github/workflows/test_nightly_many_os.yml +++ b/.github/workflows/test_nightly_many_os.yml @@ -1,4 +1,5 @@ on: + pull_request: workflow_dispatch: name: Test latest nightly releases for macOS and Linux x86_64 diff --git a/ci/basic_nightly_test.sh b/ci/basic_nightly_test.sh index 0b5f84e52e0..a23ef30ba20 100755 --- a/ci/basic_nightly_test.sh +++ b/ci/basic_nightly_test.sh @@ -17,6 +17,10 @@ if [ -n "$(ls | grep -v "roc_nightly.*tar\.gz" | grep -v "^ci$")" ]; then done fi +if [[ "$(uname)" == "Darwin" ]]; then + brew install z3 # used by llvm +fi + # decompress the tar ls | grep "roc_nightly.*tar\.gz" | xargs tar -xzvf @@ -34,23 +38,8 @@ cd roc_nightly # test rust platform ./roc examples/platform-switching/rocLovesRust.roc -run_zig_test=true -# Detect macOS version -if [[ "$(uname)" == "Darwin" ]]; then - macos_version=$(sw_vers -productVersion) - major_version=$(echo $macos_version | cut -d. -f1) - - # If macOS 13, then set the flag to skip - if [[ $major_version -eq 13 ]]; then - echo "Skipping zig test on macOS 13 due to https://github.com/roc-lang/roc/issues/5590..." - run_zig_test=false - fi -fi - -if $run_zig_test ; then - # test zig platform - ./roc examples/platform-switching/rocLovesZig.roc -fi +# test zig platform +./roc examples/platform-switching/rocLovesZig.roc # test C platform ./roc examples/platform-switching/rocLovesC.roc