Skip to content

Commit 10b9c57

Browse files
committed
Merge branch development-juce8 into testing-juce8
2 parents 1e3fb42 + 2daf0a2 commit 10b9c57

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.github/workflows/osx.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ jobs:
6262
security unlock-keychain -p $MACOS_CI_KEYCHAIN_PWD build.keychain
6363
security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
6464
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_CI_KEYCHAIN_PWD build.keychain
65-
/usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" -v open-ephys/Open\ Ephys\ GUI.app --deep --strict --timestamp --options=runtime
65+
/usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" -v open-ephys/Open\ Ephys\ GUI.app --deep --strict --timestamp --options=runtime --entitlements ../../Resources/Build-files/entitlements.plist
6666
67-
/usr/bin/codesign -dv --verbose=4 open-ephys/Open\ Ephys\ GUI.app
67+
/usr/bin/codesign -dv --verbose=4 --entitlements - open-ephys/Open\ Ephys\ GUI.app
6868
6969
# Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI
7070
@@ -124,9 +124,9 @@ jobs:
124124
security unlock-keychain -p $MACOS_CI_KEYCHAIN_PWD build.keychain
125125
security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
126126
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_CI_KEYCHAIN_PWD build.keychain
127-
/usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" -v open-ephys/Open\ Ephys\ GUI.app --deep --strict --timestamp --options=runtime
127+
/usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" -v open-ephys/Open\ Ephys\ GUI.app --deep --strict --timestamp --options=runtime --entitlements ../../Resources/Build-files/entitlements.plist
128128
129-
/usr/bin/codesign -dv --verbose=4 open-ephys/Open\ Ephys\ GUI.app
129+
/usr/bin/codesign -dv --verbose=4 --entitlements - open-ephys/Open\ Ephys\ GUI.app
130130
131131
# Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI
132132

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ endif()
302302
XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME NO
303303
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.gui"
304304
XCODE_ATTRIBUTE_EXECUTABLE_NAME "open-ephys"
305+
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Build-files/entitlements.plist"
305306
)
306307

307308
set(MAC_RESOURCE_FILES
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)