CI-actions: combine extra frameworks tests into one .yml file

2 files changed, 25 insertions, 41 deletions

diff --git a/.github/workflows/ci_frameworks.yml b/.github/workflows/ci_frameworks.yml
index 44cb843..682f5b9 100644
--- a/.github/workflows/ci_frameworks.yml
+++ b/.github/workflows/ci_frameworks.yml
@@ -5,12 +5,12 @@ on:
     paths:
       - "mesonbuild/dependencies/**"
       - "test cases/frameworks/**"
-      - ".github/workflows/frameworks.yml"
+      - ".github/workflows/ci_frameworks.yml"
   pull_request:
     paths:
       - "mesonbuild/dependencies/**"
       - "test cases/frameworks/**"
-      - ".github/workflows/frameworks.yml"
+      - ".github/workflows/ci_frameworks.yml"
 
 jobs:
 
@@ -36,3 +36,26 @@ jobs:
       with:
         name: Scalapack_Mac_test
         path: build/meson-logs/testlog.txt
+
+  HDF5macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v1
+      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
+    - run: ninja -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
diff --git a/.github/workflows/frameworks.yml b/.github/workflows/frameworks.yml
deleted file mode 100644
index da57514..0000000
--- a/.github/workflows/frameworks.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# at first, we demo HDF5 framework. More can be added.
-name: ci_frameworks
-
-on:
-  push:
-    paths:
-      - "mesonbuild/dependencies/**"
-      - "test cases/frameworks/25 hdf5"
-      - ".github/workflows/frameworks.yml"
-  pull_request:
-    paths:
-      - "mesonbuild/dependencies/**"
-      - "test cases/frameworks/25 hdf5"
-      - ".github/workflows/frameworks.yml"
-
-jobs:
-
-  macosHDF5:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
-      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
-    - run: ninja -C build
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: Mac_Log
-        path: build/meson-logs/meson-log.txt
-    - run: meson test -C build -v
-    - uses: actions/upload-artifact@v1
-      if: failure()
-      with:
-        name: Mac_Test
-        path: build/meson-logs/testlog.txt