From 8619b70bf36d8f7dfe2982fcd36c4b7bfbfef75d Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Fri, 5 Aug 2022 00:12:27 +0100
Subject: [PATCH] Revert "matrix testing"

This reverts commit b994da02e7298018a749af1e3b0110085003436f.
---
 .github/workflows/build-macos.yml | 45 ++++++++++---------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 4c8b0c7c..6dc6d8d0 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -24,7 +24,6 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'javascript' ]
-        Plan: [ pkg,dmg ]
 
     steps:
       - run: echo ${{ matrix.Plan }}
@@ -58,9 +57,7 @@ jobs:
           rm -r node_modules/pouchdb-node/node_modules/leveldown
           rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
 
-      #################################################
       - name: Build the DMG
-        if: ${{ matrix.Plan }} == dmg
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -73,20 +70,9 @@ jobs:
         run: yarn dist:universalNotWorking -p never
 
       - name: Add license to DMG
-        if: ${{ matrix.Plan }} == dmg
         run: npx dmg-license resources/license.json dist/*.dmg
 
-      - name: Upload Files (DMG)
-        if: ${{ matrix.Plan }} == dmg
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_name: ciderapp/cider-releases
-          repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: dist/Cider-${{ env.APP_VERSION }}-universal.dmg
-          tag: v${{ env.APP_VERSION }}
-
       - name: Upload macOS Latest
-        if: ${{ matrix.Plan }} == dmg
         uses: svenstaro/upload-release-action@v2
         with:
           repo_name: ciderapp/cider-releases
@@ -94,25 +80,13 @@ jobs:
           file: dist/latest-mac.yml
           tag: v${{ env.APP_VERSION }}
 
-      - name: Upload a Build Artifact
-        if: ${{ matrix.Plan }} == dmg
-        uses: actions/upload-artifact@v2.2.3
-        with:
-          name: Cider-macOS-${{ env.APP_VERSION }}-dmg
-          path: |
-            dist/*.dmg
-            dist/latest-mac.yml
-      #################################################
-
       - name: Import
-        if: ${{ matrix.Plan }} == pkg
         uses: apple-actions/import-codesign-certs@v1
         with:
           p12-file-base64: ${{ secrets.CSC_LINK }}
           p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
       - name: Build the PKG
-        if: ${{ matrix.Plan }} == pkg
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -125,17 +99,26 @@ jobs:
           xcrun stapler staple dist/Cider*.pkg || true
 
       - name: Upload a Build Artifact
-        if: ${{ matrix.Plan }} == pkg
         uses: actions/upload-artifact@v2.2.3
         with:
-          name: Cider-macOS-${{ env.APP_VERSION }}-pkg
-          path: dist/*.pkg
+          name: Cider-macOS-${{ env.APP_VERSION }}
+          path: |
+            dist/*.dmg
+            dist/*.pkg
+            dist/latest-mac.yml
+
+      - name: Upload Files (DMG)
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_name: ciderapp/cider-releases
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          file: dist/Cider-${{ env.APP_VERSION }}-universal.dmg
+          tag: v${{ env.APP_VERSION }}
 
       - name: Upload Files (PKG)
-        if: ${{ matrix.Plan }} == pkg
         uses: svenstaro/upload-release-action@v2
         with:
           repo_name: ciderapp/cider-releases
           repo_token: ${{ secrets.RELEASE_TOKEN }}
           file: dist/Cider-${{ env.APP_VERSION }}-universal.pkg
-          tag: v${{ env.APP_VERSION }}
+          tag: v${{ env.APP_VERSION }}
\ No newline at end of file