Merge pull request #1090 from RytoEX/fix-travis-osx-try2

CI: Fix macOS builds on Travis CI's Xcode 8.3 image
This commit is contained in:
Jim 2017-12-02 04:08:12 -08:00 committed by GitHub
commit a538dbe3db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -45,6 +45,8 @@ 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 ""
hr "Signing Package"

View File

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