From 1e3f6c5bdf38c1da26c7cc2b5bd4f6b3098bca2e Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 24 Feb 2016 17:40:52 +0800 Subject: [PATCH 1/4] Add matrix build for iOS and Mac --- .travis.yml | 8 +++++++- script/cibuild | 25 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa9d09fd7..5bc0c0ed2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ -osx_image: xcode7 +osx_image: xcode7.2 language: objective-c +matrix: + include: + - osx_image: xcode7.2 + env: SCHEME="ObjectiveGit Mac" + - osx_image: xcode7.2 + env: SCHEME="ObjectiveGit iOS" before_install: - brew update - brew outdated xctool || brew upgrade xctool diff --git a/script/cibuild b/script/cibuild index b72816e71..19a764840 100755 --- a/script/cibuild +++ b/script/cibuild @@ -62,14 +62,19 @@ main () "$BOOTSTRAP" || exit $? fi - echo "*** Prebuilding OpenSSL" - $SCRIPT_DIR/update_libssl_ios + if [ "$SCHEME" == "ObjectiveGit iOS" ] + then + echo "*** Prebuilding OpenSSL" + $SCRIPT_DIR/update_libssl_ios + fi - echo "*** The following schemes will be built:" - echo "$SCHEMES" | xargs -n 1 echo " " - echo + if [ -z "${SCHEME+x}" ] && [ "${#SCHEME[@]}" = 0 ] + then + echo "*** The following schemes will be built:" + echo "$SCHEMES" | xargs -n 1 echo " " + echo - echo "$SCHEMES" | xargs -n 1 | ( + echo "$SCHEMES" | xargs -n 1 | ( local status=0 while read scheme @@ -78,7 +83,13 @@ main () done exit $status - ) + ) + else + echo "*** The following scheme will be built $SCHEME" + local status=0 + build_scheme "$SCHEME" || status=1 + exit $status + fi } find_pattern () From eb64dc49fc5e16efceb82f8e5fd44fe844139ecb Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Sat, 27 Feb 2016 13:55:50 +0800 Subject: [PATCH 2/4] Remove custom deployment target for tests --- .../project.pbxproj | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1493a3343..778df49fd 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -2241,10 +2241,6 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2268,7 +2264,6 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2302,10 +2297,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2320,7 +2311,6 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2355,10 +2345,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2373,7 +2359,6 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2408,10 +2393,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2426,7 +2407,6 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., From 2dc7d720c6438151335ad00fa6383e3aca351c4e Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Mon, 29 Feb 2016 11:03:46 +0800 Subject: [PATCH 3/4] Revert changes in project file --- .../project.pbxproj | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 778df49fd..1493a3343 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -2241,6 +2241,10 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2264,6 +2268,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2297,6 +2302,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2311,6 +2320,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2345,6 +2355,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2359,6 +2373,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2393,6 +2408,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -2407,6 +2426,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., From de7f6440a1a8b39c4dd679344bcb82dd8775a7b8 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Mon, 29 Feb 2016 11:03:55 +0800 Subject: [PATCH 4/4] Use Xcode 7 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bc0c0ed2..3f53414e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ -osx_image: xcode7.2 +osx_image: xcode7 language: objective-c matrix: include: - - osx_image: xcode7.2 + - osx_image: xcode7 env: SCHEME="ObjectiveGit Mac" - - osx_image: xcode7.2 + - osx_image: xcode7 env: SCHEME="ObjectiveGit iOS" before_install: - brew update