Merge branch 'fix_native_compatibility_ci' into develop

multiscale · Apr 29, 2024 · 38746c2 · 38746c2
2 parents 0e39255 + fec8e2c
commit 38746c2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/.github/workflows/ci_macos11_clang.yaml b/.github/workflows/ci_macos11_clang.yaml
@@ -18,6 +18,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest
+
     - name: Install dependencies
       run: |
         python3 -m pip install --upgrade pip

diff --git a/.github/workflows/ci_macos11_gcc_gfortran.yaml b/.github/workflows/ci_macos11_gcc_gfortran.yaml
@@ -17,6 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest
+
     - name: Install dependencies
       run: |
         HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc

diff --git a/.github/workflows/ci_macos12_clang.yaml b/.github/workflows/ci_macos12_clang.yaml
@@ -18,6 +18,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest
+
     - name: Install dependencies
       run: |
         python3 -m pip install --upgrade pip

diff --git a/.github/workflows/ci_macos12_gcc_gfortran.yaml b/.github/workflows/ci_macos12_gcc_gfortran.yaml
@@ -17,6 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest
+
     - name: Install dependencies
       run: |
         HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc

diff --git a/.github/workflows/ci_macos13_clang.yaml b/.github/workflows/ci_macos13_clang.yaml
@@ -18,6 +18,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest
+
     - name: Install dependencies
       run: |
         HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi

diff --git a/.github/workflows/ci_macos13_gcc_gfortran.yaml b/.github/workflows/ci_macos13_gcc_gfortran.yaml
@@ -17,6 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest
+
     - name: Install dependencies
       run: |
         HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc

diff --git a/libmuscle/python/libmuscle/test/test_instance.py b/libmuscle/python/libmuscle/test/test_instance.py
@@ -363,7 +363,7 @@ def test_reuse_set_overlay(
 
     instance.reuse_instance()
 
-    assert communicator.receive_message.called_with('muscle_settings_in')
+    communicator.receive_message.assert_called_with('muscle_settings_in')
     assert settings_manager.overlay['s0'] == 0
     assert settings_manager.overlay['s1'] == 1
     assert settings_manager.overlay['s2'] == 2