From ef1c71ba990d9c1729ecb2130e89c80b839dee4b Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Sun, 24 Aug 2025 15:47:28 -0300
Subject: [PATCH 1/2] Jenkins: Minor changes to the macOS signing functions
 [skip ci]

---
 .ci/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/build.sh b/.ci/build.sh
index aa515fe86..d0a4857d9 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -138,7 +138,7 @@ mac_keychain() {
 	if [ -n "$keychain_name" ]
 	then
 		echo $keychain_name
-		security list-keychains -d user -s $(security list-keychains -d user | grep -Fv "/$keychain_name" | sed -e s/\"//g) "$keychain_name"
+		security list-keychains -d user -s $(security list-keychains -d user | grep -Fv "/$keychain_name" | sed -e s/\ \*\"//g) "$keychain_name"
 		security unlock-keychain -p "$(cat ~/86box-keychain-password.txt)" "$keychain_name"
 		return $?
 	fi
@@ -180,7 +180,7 @@ mac_notarize() {
 					echo [-] Notarizing with profile [$keychain_profile] in keychain [$keychain_name]
 					# FIXME: needs a stapling system
 					xcrun notarytool submit "$1" --keychain-profile "$keychain_profile" --keychain "$keychain_path" --no-wait
-					return 0
+					return $?
 				else
 					err="File path for keychain [$keychain_name] not found"
 				fi

From 673ea7efd9adf9841d3051cb2b99d5e2d798229b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Sun, 24 Aug 2025 22:52:36 +0200
Subject: [PATCH 2/2] GitHub Actions: Only run build when pushing or PR'ing to
 master branch

---
 .github/workflows/cmake_linux.yml         | 2 ++
 .github/workflows/cmake_macos.yml         | 2 ++
 .github/workflows/cmake_windows_msys2.yml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml
index 5dc0387d8..9e26e2cd0 100644
--- a/.github/workflows/cmake_linux.yml
+++ b/.github/workflows/cmake_linux.yml
@@ -3,6 +3,7 @@ name: CMake (Linux)
 on:
 
   push:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
@@ -14,6 +15,7 @@ on:
       - "!**/Makefile*"
 
   pull_request:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml
index c917932fe..d90c5f158 100644
--- a/.github/workflows/cmake_macos.yml
+++ b/.github/workflows/cmake_macos.yml
@@ -3,6 +3,7 @@ name: CMake (macos)
 on:
 
   push:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
@@ -14,6 +15,7 @@ on:
       - "!**/Makefile*"
 
   pull_request:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index eb83d4674..ef2e11ea7 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -3,6 +3,7 @@ name: CMake (Windows, msys2)
 on:
 
   push:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**
@@ -14,6 +15,7 @@ on:
       - "!**/Makefile*"
 
   pull_request:
+    branches: [ "master" ]
     paths:
       - src/**
       - cmake/**