From 0bc2bbef52327249eaeedd3bda8e144c67a4144e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ero=C4=9Flu?= <ilteris@asenkron.com.tr>
Date: Mon, 4 Jan 2021 18:40:21 +0000
Subject: [PATCH] merge macos jobs to 1 workflow, run 'em sequentially

---
 .github/workflows/macos-cmake.yaml       | 22 ---------
 .github/workflows/macos-make-btaddon.yml | 22 ---------
 .github/workflows/macos-make.yml         | 22 ---------
 .github/workflows/macos.yml              | 62 ++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 66 deletions(-)
 delete mode 100644 .github/workflows/macos-cmake.yaml
 delete mode 100644 .github/workflows/macos-make-btaddon.yml
 delete mode 100644 .github/workflows/macos-make.yml
 create mode 100644 .github/workflows/macos.yml

diff --git a/.github/workflows/macos-cmake.yaml b/.github/workflows/macos-cmake.yaml
deleted file mode 100644
index 8dc2d358e..000000000
--- a/.github/workflows/macos-cmake.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: MacOS (cmake) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set Git http.postBuffer to something high
-      run: git config --global http.postBuffer 524288000
-    - name: Update brew repos
-      run: brew update
-    - name: Tap RfidResearchGroup/proxmark3
-      run: brew tap RfidResearchGroup/proxmark3
-    - name: Install dependencies
-      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
-    - name: Build
-      run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
-    - name: Test
-      run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"
diff --git a/.github/workflows/macos-make-btaddon.yml b/.github/workflows/macos-make-btaddon.yml
deleted file mode 100644
index 79d2c4afa..000000000
--- a/.github/workflows/macos-make-btaddon.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: MacOS (make with BTADDON) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set Git http.postBuffer to something high
-      run: git config --global http.postBuffer 524288000
-    - name: Update brew repos
-      run: brew update
-    - name: Tap RfidResearchGroup/proxmark3
-      run: brew tap RfidResearchGroup/proxmark3
-    - name: Install dependencies
-      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
-    - name: Build
-      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
-    - name: Test
-      run: make check
diff --git a/.github/workflows/macos-make.yml b/.github/workflows/macos-make.yml
deleted file mode 100644
index aecc22b8c..000000000
--- a/.github/workflows/macos-make.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: MacOS (make) Build and Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set Git http.postBuffer to something high
-      run: git config --global http.postBuffer 524288000
-    - name: Update brew repos
-      run: brew update
-    - name: Tap RfidResearchGroup/proxmark3
-      run: brew tap RfidResearchGroup/proxmark3
-    - name: Install dependencies
-      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
-    - name: Build
-      run: make clean && make V=1
-    - name: Test
-      run: make check
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 000000000..97495eb28
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,62 @@
+name: MacOS Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-make:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set Git http.postBuffer to something high
+        run: git config --global http.postBuffer 524288000
+      - name: Update brew repos
+        run: brew update
+      - name: Tap RfidResearchGroup/proxmark3
+        run: brew tap RfidResearchGroup/proxmark3
+      - name: Install dependencies
+        run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+      - name: Build
+        run: make clean && make V=1
+      - name: Test
+        run: make check
+
+  build-make-btaddon:
+    if: always()
+    needs: [build-make]
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set Git http.postBuffer to something high
+        run: git config --global http.postBuffer 524288000
+      - name: Update brew repos
+        run: brew update
+      - name: Tap RfidResearchGroup/proxmark3
+        run: brew tap RfidResearchGroup/proxmark3
+      - name: Install dependencies
+        run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+      - name: Build
+        run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
+      - name: Test
+        run: make check
+
+  build-cmake:
+    if: always()
+    needs: [build-make, build-make-btaddon]
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set Git http.postBuffer to something high
+        run: git config --global http.postBuffer 524288000
+      - name: Update brew repos
+        run: brew update
+      - name: Tap RfidResearchGroup/proxmark3
+        run: brew tap RfidResearchGroup/proxmark3
+      - name: Install dependencies
+        run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+      - name: Build
+        run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
+      - name: Test
+        run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"