fix macos CI

MWATelescope · Sep 24, 2024 · 781f4db · 781f4db
1 parent 6c6a293
commit 781f4db
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml
@@ -7,7 +7,13 @@ name: MacOS Tests
 jobs:
   test:
     name: MacOS Tests
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        os:
+          - macos-13
+          - macos-14
+    continue-on-error: true
+    runs-on: '${{ matrix.os }}'
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -24,8 +30,12 @@ jobs:
 
       - name: Install Cargo Make
         uses: davidB/rust-cargo-make@v1
-
       - name: Install Dependencies
-        run: cargo make install_deps
-
+        run: |
+          brew install casacore/tap/casacore mwatelescope/tap/aoflagger
+          # TODO: cargo make install_deps # doesn't work
       - run: cargo make ci
+        env:
+          DYLD_FALLBACK_LIBRARY_PATH: /opt/homebrew/lib/
+          AOFLAGGER_LIB: /opt/homebrew/lib/
+          AOFLAGGER_INCLUDE_DIR: /opt/homebrew/include/
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,5 +18,5 @@ links = "aoflagger"
 cxx = "1.0.128"
 
 [build-dependencies]
-cc = { version = "1.1.8", features = ["parallel"] }
+cc = { version = "1.0.99", features = ["parallel"] }
 cxx-build = "1.0.128"
diff --git a/Makefile.toml b/Makefile.toml
@@ -72,13 +72,7 @@ dependencies = ["linux_install_aoflagger"]
 
 [tasks.mac_install_deps]
 script = """
-brew tap mwaTelescope/tap
-wget https://github.com/MWATelescope/homebrew-tap/releases/download/v2021.05.10.06.46/casacore-data--2021.02.26.catalina.bottle.1.tar.gz -O casacore-data--2021.02.26.catalina.bottle.tar.gz
-brew install -f casacore-data--2021.02.26.catalina.bottle.tar.gz
-wget https://github.com/MWATelescope/homebrew-tap/releases/download/v2021.05.10.06.46/casacore--3.4.0.catalina.bottle.1.tar.gz -O casacore--3.4.0.catalina.bottle.tar.gz
-brew install -f casacore--3.4.0.catalina.bottle.tar.gz
-wget https://github.com/MWATelescope/homebrew-tap/releases/download/v2021.05.10.06.46/aoflagger--3.0.0.catalina.bottle.1.tar.gz -O aoflagger--3.0.0.catalina.bottle.tar.gz
-brew install -f aoflagger--3.0.0.catalina.bottle.tar.gz
+brew install casacore/tap/casacore mwatelescope/tap/aoflagger
 """
 
 [tasks.install_deps]

diff --git a/build.rs b/build.rs
@@ -53,6 +53,8 @@ fn main() {
 
     println!("cargo:rerun-if-env-changed=AOFLAGGER_INCLUDE_DIR");
     println!("cargo:rerun-if-env-changed=AOFLAGGER_LIB");
+    println!("cargo:rerun-if-env-changed=LD_LIBRARY_PATH");
+    println!("cargo:rerun-if-env-changed=DYLD_FALLBACK_LIBRARY_PATH");
 
     println!("cargo:rerun-if-changed=src/cxx_aoflagger.rs");
     println!("cargo:rerun-if-changed=src/cxx_aoflagger.cc");