Skip to content

Commit 900e95a

Browse files
committed
Run macOS arm64 on github hosted runner
- This will be using x64 machines, but Xcode lets you cross-compile for both archs - For webrtc/native-sdks we build everything on x64 machines - I am not sure though if some of these deps installed or whatever except to be on arm64 system - Like how OBS build is configured and such and going into this would be waste of time now - Thus if this doesn't work we will just fix the self hosted machine and thats it
1 parent 52181e0 commit 900e95a

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

Diff for: .github/workflows/main.yml

+13-7
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ jobs:
131131
security unlock-keychain -p "${KEYCHAIN_PASSWORD}" ${KEYCHAIN_PATH}
132132
security import ${CERTIFACTE_PATH} -P ${MACOS_SIGNING_CERT_PASSWORD} -A -t cert -f pkcs12 -k ${KEYCHAIN_PATH}
133133
security list-keychain -d user -s ${KEYCHAIN_PATH}
134-
135134
env:
136135
MACOS_SIGNING_CERT: ${{ secrets.MACOS_SIGNING_CERT }}
137136
MACOS_SIGNING_CERT_PASSWORD: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
@@ -195,7 +194,7 @@ jobs:
195194

196195
macos_build_arm64:
197196
name: 'MacOS-arm64'
198-
runs-on: ['self-hosted', 'macOS', 'ARM64']
197+
runs-on: [macos-12]
199198
env:
200199
MACOSX_DEPLOYMENT_TARGET_ARM64: '11.0'
201200
SPARKLE_VERSION: '1.26.0'
@@ -264,12 +263,20 @@ jobs:
264263
rm -rf ${{ github.workspace }}/plugins/obs-browser
265264
git submodule update --init --recursive
266265
267-
- name: 'Unlock keychain'
266+
- name: 'Install MacOS cert and create keychain'
268267
run: |
269-
security -v unlock-keychain -p ${MACOS_KEYCHAIN_PASSWORD} ${MACOS_KEYCHAIN_PATH} && echo "Keychain is unlocked" || exit 1
268+
echo -n ${MACOS_SIGNING_CERT} | base64 --decode -o ${CERTIFACTE_PATH}
269+
security create-keychain -p "${KEYCHAIN_PASSWORD}" ${KEYCHAIN_PATH}
270+
security set-keychain-settings -lut 3600 $KEYCHAIN_PATH
271+
security unlock-keychain -p "${KEYCHAIN_PASSWORD}" ${KEYCHAIN_PATH}
272+
security import ${CERTIFACTE_PATH} -P ${MACOS_SIGNING_CERT_PASSWORD} -A -t cert -f pkcs12 -k ${KEYCHAIN_PATH}
273+
security list-keychain -d user -s ${KEYCHAIN_PATH}
270274
env:
271-
MACOS_KEYCHAIN_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
272-
MACOS_KEYCHAIN_PATH: /Users/dolbyvoice/Library/Keychains/cosmosoftware.keychain-db
275+
MACOS_SIGNING_CERT: ${{ secrets.MACOS_SIGNING_CERT }}
276+
MACOS_SIGNING_CERT_PASSWORD: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
277+
KEYCHAIN_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
278+
KEYCHAIN_PATH: ${{ github.workspace }}/app-signing.keychain-db
279+
CERTIFACTE_PATH: ${{ github.workspace }}/app-signing-cert.p12
273280

274281
# Geneate OBS without obs-ndi plugin
275282
- name: 'Build OBS - no NDI'
@@ -505,7 +512,6 @@ jobs:
505512
echo "PATH=$newPath" >> $GITHUB_ENV
506513
echo "$env:PATH =$newPath"
507514
Remove-Item cmake.zip
508-
cmake --version
509515
shell: powershell
510516

511517
- name: 'Setup plugings'

0 commit comments

Comments
 (0)