From 0f675d5ad0e99f5a029dcbbff6e1c6f803349513 Mon Sep 17 00:00:00 2001
From: Niall Byrne <9848926+niall-byrne@users.noreply.github.com>
Date: Wed, 4 Dec 2024 19:43:59 +0000
Subject: [PATCH] ci(GITHUB): deprecate monterey builds

---
 .github/workflows/push.yml | 51 ++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index a4d6e34..84d3292 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -67,12 +67,15 @@ jobs:
 
     # Only on tags, main and production branches.
 
-    runs-on: macos-${{ matrix.os }}
+    runs-on: macos-${{ matrix.os.version }}
     strategy:
       max-parallel: 4
       matrix:
-        os: [12, 13]
-        platform: [x86_64]
+        os:
+          - version: 13
+            platform: x86_64
+          - version: 14
+            platform: arm64
         python-version: [3.11.11]
 
     steps:
@@ -101,30 +104,30 @@ jobs:
         if: steps.branch_filter.outputs.match == 'TRUE'
         uses: actions/download-artifact@v3
         with:
-          name: built_binary_${{ matrix.os }}_${{ matrix.platform }}_${{ env.BRANCH_OR_TAG }}
+          name: built_binary_${{ matrix.os.version }}_${{ matrix.os.platform }}_${{ env.BRANCH_OR_TAG }}
 
       - name: Apply Test -- Clear Quarantine Attribute
         if: steps.branch_filter.outputs.match == 'TRUE'
         run: |
-          tar xvzf mac_maker_${{ matrix.os }}_${{ matrix.platform }}_${BRANCH_OR_TAG}.tar.gz
-          xattr -d -r com.apple.quarantine mac_maker_${{ matrix.os }}_${{ matrix.platform }}_${BRANCH_OR_TAG}
+          tar xvzf mac_maker_${{ matrix.os.version }}_${{ matrix.os.platform }}_${BRANCH_OR_TAG}.tar.gz
+          xattr -d -r com.apple.quarantine mac_maker_${{ matrix.os.version }}_${{ matrix.os.platform }}_${BRANCH_OR_TAG}
 
       - name: Apply Test -- Apply a Profile
         if: steps.branch_filter.outputs.match == 'TRUE'
         run: |
-          cd mac_maker_${{ matrix.os }}_${{ matrix.platform }}_${BRANCH_OR_TAG}
+          cd mac_maker_${{ matrix.os.version }}_${{ matrix.os.platform }}_${BRANCH_OR_TAG}
           export ANSIBLE_BECOME_PASSWORD="skip the prompt"
           ./mac_maker apply github https://github.com/osx-provisioner/profile-example.git
 
       - name: Apply Test -- Report Job Status (Success)
         if: steps.branch_filter.outputs.match == 'TRUE' && env.VERBOSE_NOTIFICATIONS == '1'
         run: |
-          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":white_check_mark: ${{ matrix.os }} profile application using built binary (${{ matrix.os }} ${{ matrix.platform }}) was successful"
+          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":white_check_mark: ${{ matrix.os }} profile application using built binary (${{ matrix.os.version }} ${{ matrix.os.platform }}) was successful"
 
       - name: Apply Test -- Report Job Status (Failure)
         if: failure()
         run: |
-          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":x: ${{ matrix.os }} profile application using built binary (${{ matrix.os }} ${{ matrix.platform }}) failed!"
+          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":x: ${{ matrix.os.version }} profile application using built binary (${{ matrix.os }} ${{ matrix.os.platform }}) failed!"
 
   attach_release_binaries:
     needs: [create_release]
@@ -133,8 +136,11 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        os: [12, 13]
-        platform: [x86_64]
+        os:
+          - version: 13
+            platform: x86_64
+          - version: 14
+            platform: arm64
         python-version: [3.11.11]
 
     steps:
@@ -163,7 +169,7 @@ jobs:
         if: steps.branch_filter.outputs.match == 'TRUE'
         uses: actions/download-artifact@v3
         with:
-          name: built_binary_${{ matrix.os }}_${{ matrix.platform }}_${{ env.BRANCH_OR_TAG }}
+          name: built_binary_${{ matrix.os.version }}_${{ matrix.os.platform }}_${{ env.BRANCH_OR_TAG }}
 
       - name: Attach Release Binaries -- Identify Binary
         if: steps.branch_filter.outputs.match == 'TRUE'
@@ -474,12 +480,15 @@ jobs:
 
     # Only on tags, main and production branches.
 
-    runs-on: macos-${{ matrix.os }}
+    runs-on: macos-${{ matrix.os.version }}
     strategy:
       max-parallel: 4
       matrix:
-        os: [12, 13]
-        platform: [x86_64]
+        os:
+          - version: 13
+            platform: x86_64
+          - version: 14
+            platform: arm64
         python-version: [3.11.11]
 
     steps:
@@ -528,8 +537,8 @@ jobs:
           ./scripts/build.sh binary "${OS_VERSION}" "${BRANCH_OR_TAG}"
         env:
           PYENV_VERSION: ${{ matrix.python-version }}
-          OS_VERSION: ${{ matrix.os }}
-          PLATFORM: ${{ matrix.platform }}
+          OS_VERSION: ${{ matrix.os.version }}
+          PLATFORM: ${{ matrix.os.platform }}
 
       - name: OSX Build -- Test the version command
         if: steps.branch_filter.outputs.match == 'TRUE'
@@ -543,17 +552,17 @@ jobs:
         if: steps.branch_filter.outputs.match == 'TRUE'
         uses: actions/upload-artifact@v3
         with:
-          name: built_binary_${{ matrix.os }}_${{ matrix.platform }}_${{ env.BRANCH_OR_TAG }}
-          path: ./dist/mac_maker_${{ matrix.os }}_${{ matrix.platform }}_${{ env.BRANCH_OR_TAG }}.tar.gz
+          name: built_binary_${{ matrix.os.version }}_${{ matrix.os.platform }}_${{ env.BRANCH_OR_TAG }}
+          path: ./dist/mac_maker_${{ matrix.os.version }}_${{ matrix.os.platform }}_${{ env.BRANCH_OR_TAG }}.tar.gz
           retention-days: 1
           if-no-files-found: error
 
       - name: OSX Build -- Report Job Status (Success)
         if: steps.branch_filter.outputs.match == 'TRUE' && env.VERBOSE_NOTIFICATIONS == '1'
         run: |
-          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":white_check_mark: ${{ matrix.os }} binary build for Python ${PYTHON_VERSION} was successful"
+          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":white_check_mark: ${{ matrix.os.version }} binary build for Python ${PYTHON_VERSION} was successful"
 
       - name: OSX Build -- Report Job Status (Failure)
         if: failure()
         run: |
-          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":x: ${{ matrix.os }} binary build for Python ${PYTHON_VERSION} failed!"
+          ./.github/scripts/notifications.sh "${NOTIFICATION}" ":x: ${{ matrix.os.version }} binary build for Python ${PYTHON_VERSION} failed!"