OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1100 from RytoEX/fix-ci-osx

Browse source 
CI: Fix Mac builds on Travis CI's Xcode 8.3 image
This commit is contained in:
Jim 2017-12-03 03:16:31 -08:00 committed by GitHub
parent 51bd92b20e b6348c932b
commit 410a3cd40b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CI/before-deploy-osx.sh
View file

@ -45,10 +45,10 @@ security create-keychain -p mysecretpassword build.keychain
security default-keychain -s build.keychain
security unlock-keychain -p mysecretpassword build.keychain
security set-keychain-settings -t 3600 -u build.keychain
security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain
security list-keychains -s build.keychain
hr "Importing certs into keychain"
security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""
# macOS 10.12+
security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain
hr "Signing Package"
productsign --sign 2MMRE5MTB8 ./OBS.pkg ./$FILENAME

5
CI/install/osx/build_app.py
View file

@ -84,10 +84,9 @@ for i in candidate_paths:
for file_ in files:
path = root + "/" + file_
try:
out = check_output("{0}otool -L '{1}'".format(args.prefix, path),
stderr=subprocess.STDOUT, shell=True,
out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
universal_newlines=True)
if "The file was not recognized as a valid object file" in out:
if "is not an object file" in out:
continue
except:
continue