Merge branch 'master' of https://github.com/86Box/86Box

.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

.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/**

.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/**

.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/**