fix Mac CI (#3808)

* fix Mac CI * disable M1 tests for now
charmplusplus · May 1, 2024 · 0b36b17 · 0b36b17
1 parent 79f86b2
commit 0b36b17
Showing 1 changed file with 39 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -129,7 +129,7 @@ jobs:
 
   multicore-darwin-x86_64_projections:
     timeout-minutes: 60
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v4
     - name: build
@@ -148,6 +148,28 @@ jobs:
         files=$(find . -name *.sts)
         for f in $files; do echo $f; pushd .; cd $(dirname $f); $proj --exit $(basename $f); popd; done
 
+  # FIXME: disabled since tests don't pass
+  # multicore-darwin-arm8_projections:
+  #   timeout-minutes: 60
+  #   runs-on: macos-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: build
+  #     run: ./build LIBS multicore-darwin-arm8 -g -j3 --with-production --enable-tracing
+  #   - name: test
+  #     run: |
+  #       make -C multicore-darwin-arm8/tmp all-test -j3 OPTS="-g -tracemode projections"
+  #       make -C multicore-darwin-arm8/tmp test
+  #   - name: projections
+  #     run: |
+  #       git clone https://github.com/UIUC-PPL/projections
+  #       cd projections
+  #       make
+  #       proj=$PWD/bin/projections
+  #       cd ..
+  #       files=$(find . -name *.sts)
+  #       for f in $files; do echo $f; pushd .; cd $(dirname $f); $proj --exit $(basename $f); popd; done
+
   namd_netlrts-linux-x86_64:
     # Since NAMD requires a secret to download its source from Gitlab, CI builds from outside PPL
     # always fail in this test since the secret is not available.
@@ -208,7 +230,7 @@ jobs:
 
   netlrts-darwin-x86_64:
     timeout-minutes: 60
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v4
     - name: build
@@ -219,6 +241,20 @@ jobs:
     - name: testp P=2
       run: make -C netlrts-darwin-x86_64/tmp testp P=2 TESTOPTS="++local"
 
+  # FIXME: disabled since tests don't pass
+  # netlrts-darwin-arm8:
+  #   timeout-minutes: 60
+  #   runs-on: macos-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: build
+  #     run: ./build all-test netlrts-darwin-arm8 --build-shared --with-production --enable-error-checking --enable-lbuserdata -j3 -g -Werror=vla
+  #     # TODO: this should build tests with "-charm-shared". See #2735 on why this is not done currently.
+  #   - name: test
+  #     run: make -C netlrts-darwin-arm8/tmp test TESTOPTS="++local"
+  #   - name: testp P=2
+  #     run: make -C netlrts-darwin-arm8/tmp testp P=2 TESTOPTS="++local"
+
   netlrts-linux-i386:
     timeout-minutes: 60
     runs-on: ubuntu-latest
@@ -300,7 +336,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
 
     steps:
     - uses: actions/checkout@v4