From 848a14ee8570902b878d0c65d7f36260555164ce Mon Sep 17 00:00:00 2001
From: Dhruv Chandwani <dhchandw@silabs.com>
Date: Mon, 25 Nov 2024 20:08:37 -0500
Subject: [PATCH] updating to macos-14 (#1486)

* updating to macos-14

* only installing macos packages if missing
---
 .github/workflows/release.yml   | 16 ++++++++--------
 src-script/install-packages-osx |  9 +++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6fdf285b19..78c3c0d244 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -148,7 +148,7 @@ jobs:
     # Platforms to build on/for
     strategy:
       matrix:
-        os: [macos-12, ubuntu-22.04]
+        os: [macos-14, ubuntu-22.04]
       fail-fast: false
 
     steps:
@@ -261,7 +261,7 @@ jobs:
       - name: Verify zap-cli exists in Windows x64 .zip package
         if: startsWith(matrix.os, 'macos')
         run: |
-          output=$(./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-x64.zip)
+          output=$(7za l ./dist/zap-win-x64.zip)
           expression=zap-cli
           if [[ $output == *"$expression"* ]]; then
             echo "Output contains $expression"
@@ -272,7 +272,7 @@ jobs:
       - name: Verify zap-cli exists in Windows arm64 .zip package
         if: startsWith(matrix.os, 'macos')
         run: |
-          output=$(./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-arm64.zip)
+          output=$(7za l ./dist/zap-win-arm64.zip)
           expression=zap-cli
           if [[ $output == *"$expression"* ]]; then
             echo "Output contains $expression"
@@ -283,7 +283,7 @@ jobs:
       - name: Verify zap-cli exists in macOS x64 .zip package
         if: startsWith(matrix.os, 'macos')
         run: |
-          output=$(./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-mac-x64.zip | grep zap-cli)
+          output=$(7za l ./dist/zap-mac-x64.zip | grep zap-cli)
           expression=zap-cli
           if [[ $output == *"$expression"* ]]; then
             echo "Output contains $expression"
@@ -350,7 +350,7 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: GuillaumeFalourd/assert-command-line-output@v2.1
         with:
-          command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-x64.zip | grep apack.json
+          command_line: 7za l ./dist/zap-win-x64.zip | grep apack.json
           contains: 'apack.json'
       - name: Verify apack.json exists in Windows x64 .zip package's app.asar archive
         if: startsWith(matrix.os, 'macos')
@@ -362,7 +362,7 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: GuillaumeFalourd/assert-command-line-output@v2.1
         with:
-          command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-win-arm64.zip | grep apack.json
+          command_line: 7za l ./dist/zap-win-arm64.zip | grep apack.json
           contains: 'apack.json'
       - name: Verify apack.json exists in Windows arm64 .zip package's app.asar archive
         if: startsWith(matrix.os, 'macos')
@@ -375,7 +375,7 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: GuillaumeFalourd/assert-command-line-output@v2.1
         with:
-          command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-mac-x64.zip | grep apack.json
+          command_line: 7za l ./dist/zap-mac-x64.zip | grep apack.json
           contains: 'apack.json'
       - name: Verify apack.json exists in macOS x64 .zip package's app-x64.asar archive
         if: startsWith(matrix.os, 'macos')
@@ -387,7 +387,7 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: GuillaumeFalourd/assert-command-line-output@v2.1
         with:
-          command_line: ./node_modules/7zip-bin/mac/x64/7za l ./dist/zap-mac-arm64.zip | grep apack.json
+          command_line: 7za l ./dist/zap-mac-arm64.zip | grep apack.json
           contains: 'apack.json'
       - name: Verify apack.json exists in macOS arm64 .zip package's app-arm64.asar archive
         if: startsWith(matrix.os, 'macos')
diff --git a/src-script/install-packages-osx b/src-script/install-packages-osx
index 07bfa01f92..21faeb092f 100755
--- a/src-script/install-packages-osx
+++ b/src-script/install-packages-osx
@@ -1,5 +1,6 @@
 #!/bin/bash
-#
-# Packages you have to install on macOS to get source build to compile via npm install.
-#
-brew install pkg-config cairo pango libpng jpeg giflib librsvg
+
+# Packages required for macOS to build the source via npm install
+for pkg in cairo pango libpng jpeg giflib librsvg; do
+  brew list --formula "$pkg" &>/dev/null || brew install "$pkg"
+done