CI: combine macos and ci_frameworks actions

We're already covering most of the actions through the generic macos
actions, but we should keep the qt4 action.

2 files changed, 25 insertions, 86 deletions

diff --git a/.github/workflows/ci_frameworks.yml b/.github/workflows/ci_frameworks.yml
deleted file mode 100644
index 1ace2a6..0000000
--- a/.github/workflows/ci_frameworks.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: ci_frameworks
-
-on:
-  push:
-    paths:
-      - "mesonbuild/dependencies/**"
-      - "test cases/frameworks/**"
-      - ".github/workflows/ci_frameworks.yml"
-  pull_request:
-    paths:
-      - "mesonbuild/dependencies/**"
-      - "test cases/frameworks/**"
-      - ".github/workflows/ci_frameworks.yml"
-
-jobs:
-
-  scalapackMacOS:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - run: python -m pip install -e .
-    - run: brew install pkg-config ninja gcc openmpi lapack scalapack
-    - run: meson setup "test cases/frameworks/30 scalapack" build
-    - run: meson compile -C build
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: Scalapack_Mac_build
-        path: build/meson-logs/meson-log.txt
-    - run: meson test -C build -v
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: Scalapack_Mac_test
-        path: build/meson-logs/testlog.txt
-
-  HDF5macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - run: python -m pip install -e .
-    - run: brew install pkg-config ninja gcc hdf5
-    - run: meson setup "test cases/frameworks/25 hdf5" build -Dmethod=config-tool
-    - run: meson compile -C build
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: HDF5_Mac_build
-        path: build/meson-logs/meson-log.txt
-    - run: meson test -C build -v
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: HDF5_Mac_test
-        path: build/meson-logs/testlog.txt
-
-  Qt4macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - run: python -m pip install -e .
-    - run: brew install pkg-config ninja gcc
-    - run: brew tap cartr/qt4
-    - run: brew install qt@4
-    - run: meson setup "test cases/frameworks/4 qt" build -Drequired=qt4
-    - run: meson compile -C build
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: Qt4_Mac_build
-        path: build/meson-logs/meson-log.txt
-    - run: meson test -C build -v
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: Qt4_Mac_test
-        path: build/meson-logs/testlog.txt
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f793692..bf559e8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -58,3 +58,28 @@ jobs:
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
         export PATH="$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin"
         ./run_project_tests.py --backend=ninja
+
+  Qt4macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - run: python -m pip install -e .
+    - run: brew install pkg-config ninja gcc
+    - run: brew tap cartr/qt4
+    - run: brew install qt@4
+    - run: meson setup "test cases/frameworks/4 qt" build -Drequired=qt4
+    - run: meson compile -C build
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: Qt4_Mac_build
+        path: build/meson-logs/meson-log.txt
+    - run: meson test -C build -v
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: Qt4_Mac_test
+        path: build/meson-logs/testlog.txt