Bladeren bron

Merge pull request #1088 from RytoEX/fix-travis-osx

CI: Fix Mac builds on Travis CI's Xcode 8.3 image
Jim 8 jaren geleden
bovenliggende
commit
5da7a90b8b
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      CI/before-deploy-osx.sh
  2. 1 1
      CI/install/osx/build_app.py

+ 1 - 1
CI/before-deploy-osx.sh

@@ -48,7 +48,7 @@ security set-keychain-settings -t 3600 -u build.keychain
 hr "Importing certs into keychain"
 security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""
 hr "Signing Package"
-productsign --sign 'Developer ID Installer: Hugh Bailey (2MMRE5MTB8)' ./OBS.pkg ./$FILENAME
+productsign --sign 2MMRE5MTB8 ./OBS.pkg ./$FILENAME
 
 # Move to the folder that travis uses to upload artifacts from
 hr "Moving package to nightly folder for distribution"

+ 1 - 1
CI/install/osx/build_app.py

@@ -86,7 +86,7 @@ for i in candidate_paths:
 			try:
 				out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
 						universal_newlines=True)
-				if "is not an object file" in out:
+				if "The file was not recognized as a valid object file" in out:
 					continue
 			except:
 				continue