OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-08 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Update main workflow to enable building with macOS 13 runners

Browse source
This commit is contained in:
PatTheMav 2023-06-24 18:31:46 +02:00 committed by Ryan Foster
parent af7dbba451
commit a01e2e9ced
3 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/main.yml vendored
View file

@ -88,7 +88,7 @@ jobs:
macos_build:
name: '02 - macOS'
runs-on: [macos-12]
runs-on: [macos-13]
strategy:
matrix:
arch: ['x86_64', 'arm64']
@ -200,6 +200,7 @@ jobs:
env:
PROVISIONING_PROFILE: ${{ steps.macos-codesign.outputs.provisionprofileUUID }}
run: |
sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
if [[ '${{ steps.github-check.outputs.generator }}' == 'Xcode' ]]; then
SEEKING_TESTERS=1 CI/macos/02_build_obs.sh --codesign --architecture "${{ matrix.arch }}"
else
@ -216,6 +217,11 @@ jobs:
esac
if [[ "${PACKAGE}" ]]; then
sudo sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db \
"INSERT OR REPLACE INTO access VALUES('kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552);"
sudo sqlite3 /Library/Application\ Support/com.apple.TCC/TCC.db \
"INSERT OR REPLACE INTO access VALUES('kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552);"
CI/macos/03_package_obs.sh --codesign --architecture "${{ matrix.arch }}"
ARTIFACT_NAME=$(basename $(/usr/bin/find build_macos -type f -name "obs-studio-*.dmg" -depth 1 | head -1))
echo "FILE_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
@ -394,7 +400,7 @@ jobs:
macos_release:
name: '03 - macOS notarized image'
runs-on: [macos-12]
runs-on: [macos-13]
needs: [macos_build]
env:
BUILD_FOR_DISTRIBUTION: 'ON'
@ -513,7 +519,7 @@ jobs:
macos_sparkle:
name: '04 - macOS Sparkle Updates'
runs-on: [macos-12]
runs-on: [macos-13]
needs: [macos_release]
if: fromJSON(needs.macos_release.outputs.run_sparkle)
strategy:

15
cmake/macos/defaults.cmake
View file

@ -48,18 +48,5 @@ set(OBS_LIBRARY_DESTINATION "lib")
set(OBS_INCLUDE_DESTINATION "include/obs")
set(OBS_CMAKE_DESTINATION "lib/cmake")
set(_dmg_package_name "OBS")
set(_dmg_background_filename "background.tiff")
set(_dmg_window_x 100)
set(_dmg_window_y 100)
set(_dmg_window_width 540)
set(_dmg_window_height 380)
set(_dmg_icon_size 96)
set(_dmg_text_size 16)
set(_dmg_obs_x 124)
set(_dmg_obs_y 180)
set(_dmg_app_link_x 416)
set(_dmg_app_link_y 180)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/package.applescript.in"
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/package.applescript"
"${CMAKE_CURRENT_BINARY_DIR}/package.applescript" @ONLY)

18
cmake/macos/resources/package.applescript.in → cmake/macos/resources/package.applescript
View file

@ -3,10 +3,10 @@ on run (volumeName)
tell disk (volumeName as string)
open
set theXOrigin to @_dmg_window_x@
set theYOrigin to @_dmg_window_y@
set theWidth to @_dmg_window_width@
set theHeight to @_dmg_window_height@
set theXOrigin to 100
set theYOrigin to 100
set theWidth to 540
set theHeight to 380
set theBottomRightX to (theXOrigin + theWidth)
set theBottomRightY to (theYOrigin + theHeight)
@ -23,13 +23,13 @@ on run (volumeName)
set opts to the icon view options of container window
tell opts
set icon size to @_dmg_icon_size@
set text size to @_dmg_text_size@
set icon size to 96
set text size to 16
set arrangement to not arranged
end tell
set background picture of opts to file ".background:@_dmg_background_filename@"
set position of item "@_dmg_package_name@.app" to {@_dmg_obs_x@, @_dmg_obs_y@}
set position of item "Applications" to {@_dmg_app_link_x@, @_dmg_app_link_y@}
set background picture of opts to file ".background:background.tiff"
set position of item "OBS.app" to {124, 180}
set position of item "Applications" to {416, 180}
close
open
-- Force saving of the size