Skip to content

Commit

Permalink
Merge pull request #196 from nsforge/fix-ci
Browse files Browse the repository at this point in the history
Fix CI by replacing objc-build-scripts with Travis's builtin Xcode support
  • Loading branch information
tonyarnold authored Dec 21, 2018
2 parents fa55aaf + 84d9447 commit cdc7411
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 397 deletions.
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
language: objective-c
osx_image: xcode611
osx_image: xcode10.1
xcode_project: Expecta.xcodeproj

script:
- rake clean
- Tests/Support/objc-build-scripts/cibuild
matrix:
include:
- xcode_scheme: Expecta
xcode_destination: platform=macOS
- xcode_scheme: Expecta-iOS
xcode_destination: platform=iOS Simulator,OS=12.1,name=iPhone X
38 changes: 0 additions & 38 deletions Expecta.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,6 @@
3A0A59941AD441CB003DA3E4 /* Sources */,
3A0A59B71AD441CB003DA3E4 /* Frameworks */,
3A0A59B91AD441CB003DA3E4 /* Resources */,
3A0A59BA1AD441CB003DA3E4 /* ShellScript */,
3A0A59C41AD44A87003DA3E4 /* Embed Framework */,
);
buildRules = (
Expand Down Expand Up @@ -1298,19 +1297,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
3A0A59BA1AD441CB003DA3E4 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
};
E93067D813B2E6D100EA26FF /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1687,10 +1673,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch";
INFOPLIST_FILE = "Tests/Support/Test-Info.plist";
Expand All @@ -1710,10 +1692,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch";
INFOPLIST_FILE = "Tests/Support/Test-Info.plist";
Expand All @@ -1733,10 +1711,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch";
INFOPLIST_FILE = "Tests/Support/Test-Info.plist";
Expand All @@ -1755,10 +1729,6 @@
3A0A59BC1AD441CB003DA3E4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch";
INFOPLIST_FILE = "Tests/Support/Test-Info.plist";
Expand All @@ -1779,10 +1749,6 @@
3A0A59BD1AD441CB003DA3E4 /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch";
INFOPLIST_FILE = "Tests/Support/Test-Info.plist";
Expand All @@ -1803,10 +1769,6 @@
3A0A59BE1AD441CB003DA3E4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch";
INFOPLIST_FILE = "Tests/Support/Test-Info.plist";
Expand Down
18 changes: 0 additions & 18 deletions Tests/Support/objc-build-scripts/LICENSE.md

This file was deleted.

82 changes: 0 additions & 82 deletions Tests/Support/objc-build-scripts/README.md

This file was deleted.

47 changes: 0 additions & 47 deletions Tests/Support/objc-build-scripts/bootstrap

This file was deleted.

Loading

0 comments on commit cdc7411

Please sign in to comment.