瀏覽代碼

CI: Fix macOS builds on Travis CI's Xcode 8.3 image

The Travis CI Xcode 8.3 image uses macOS 10.12, where some OS and Xcode
components were changed. This commit should hopefully fix macOS
deployments on Travis for Xcode 8.3.
Ryan Foster 8 年之前
父節點
當前提交
4a1c415270
共有 2 個文件被更改,包括 4 次插入1 次删除
  1. 2 0
      CI/before-deploy-osx.sh
  2. 2 1
      CI/install/osx/build_app.py

+ 2 - 0
CI/before-deploy-osx.sh

@@ -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"

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

@@ -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