Skip to content

Commit

Permalink
Merge pull request #631 from libgit2/tiennou/travis-fix
Browse files Browse the repository at this point in the history 
Fix Tests
  • Loading branch information
@tiennou
tiennou authored Jun 19, 2017
2 parents 2279630 + 08b137a commit 90f3d41
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
osx_image: xcode8
osx_image: xcode8.3
language: objective-c
matrix:
fast_finish: true
include:
- osx_image: xcode8
- osx_image: xcode8.3
env:
- SCHEME="ObjectiveGit Mac"
- osx_image: xcode8
- osx_image: xcode8.3
env:
- SCHEME="ObjectiveGit iOS"
before_install:
Expand Down
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "jspahrsummers/xcconfigs" >= 0.7.1
github "Quick/Quick" ~> 0.9.2
github "Quick/Nimble" ~> 4.0
github "Quick/Quick" ~> 1.1.0
github "Quick/Nimble" ~> 5.0
github "ZipArchive/ZipArchive" ~> 1.1
8 changes: 4 additions & 4 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v4.1.0"
github "Quick/Quick" "v0.9.3"
github "ZipArchive/ZipArchive" "v1.6.2"
github "jspahrsummers/xcconfigs" "0.9"
github "Quick/Nimble" "v5.1.1"
github "Quick/Quick" "v1.1.0"
github "ZipArchive/ZipArchive" "v1.8.1"
github "jspahrsummers/xcconfigs" "0.10"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 159 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 153 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ZipArchive
Submodule ZipArchive updated 30 files
+3 −3 .travis.yml
+5 −1 ObjectiveCExample/ObjectiveCExample.xcodeproj/project.pbxproj
+1 −1 ObjectiveCExample/ObjectiveCExample.xcodeproj/xcshareddata/xcschemes/ObjectiveCExample.xcscheme
+9 −0 ObjectiveCExample/ObjectiveCExample/Sample Data/1.md
+7 −0 ObjectiveCExample/ObjectiveCExample/Sample Data/2.md
+0 −9 ObjectiveCExample/ObjectiveCExample/Sample Data/China to ban ivory trade.md
+0 −9 ObjectiveCExample/ObjectiveCExample/Sample Data/Kerry in Syria.md
+ − ObjectiveCExample/ObjectiveCExample/Sample Data/mountain.png
+ − ObjectiveCExample/ObjectiveCExample/Sample Data/wapo twitter banner.png
+33 −2 ObjectiveCExample/ObjectiveCExampleTests/SSZipArchiveTests.m
+3 −3 ObjectiveCExample/Podfile.lock
+1 −1 SSZipArchive.podspec
+12 −2 SSZipArchive/SSZipArchive.h
+193 −101 SSZipArchive/SSZipArchive.m
+8 −4 SSZipArchive/minizip/unzip.c
+1 −0 SSZipArchive/minizip/unzip.h
+3 −3 SwiftExample/Podfile.lock
+4 −47 SwiftExample/SwiftExample.xcodeproj/project.pbxproj
+10 −6 SwiftExample/SwiftExample/Base.lproj/LaunchScreen.storyboard
+13 −4 SwiftExample/SwiftExample/Base.lproj/Main.storyboard
+9 −0 SwiftExample/SwiftExample/Sample Data/1.md
+7 −0 SwiftExample/SwiftExample/Sample Data/2.md
+0 −9 SwiftExample/SwiftExample/Sample Data/China to ban ivory trade.md
+0 −9 SwiftExample/SwiftExample/Sample Data/Kerry in Syria.md
+ − SwiftExample/SwiftExample/Sample Data/mountain.png
+ − SwiftExample/SwiftExample/Sample Data/wapo twitter banner.png
+4 −0 SwiftExample/SwiftExample/ViewController.swift
+13 −4 ZipArchive.xcodeproj/project.pbxproj
+1 −1 ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-Mac.xcscheme
+1 −1 ZipArchive.xcodeproj/xcshareddata/xcschemes/ZipArchive-iOS.xcscheme
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Submodule xcconfigs updated from d78854 to cc451b
26 changes: 20 additions & 6 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1279,11 +1279,11 @@
attributes = {
LastSwiftUpdateCheck = 0700;
LastTestingUpgradeCheck = 0510;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = "GitHub, Inc";
TargetAttributes = {
88F05A6A16011E5400B7AD1D = {
LastSwiftMigration = 0800;
LastSwiftMigration = 0830;
};
8DC2EF4F0486A6940098B216 = {
LastSwiftMigration = 0800;
Expand All @@ -1294,6 +1294,7 @@
};
F879D8351B4B7F7C002D5C07 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0830;
};
};
};
Expand Down Expand Up @@ -1739,7 +1740,7 @@
External/libgit2/include,
/usr/local/include,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LIBRARY_SEARCH_PATHS = (
.,
External,
Expand Down Expand Up @@ -1773,7 +1774,7 @@
External/libgit2/include,
/usr/local/include,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LIBRARY_SEARCH_PATHS = (
.,
External,
Expand Down Expand Up @@ -1861,6 +1862,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -1880,6 +1882,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -1897,7 +1900,7 @@
External/libgit2/include,
/usr/local/include,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LIBRARY_SEARCH_PATHS = (
.,
External,
Expand Down Expand Up @@ -1957,6 +1960,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Test;
};
Expand Down Expand Up @@ -2134,7 +2138,7 @@
External/libgit2/include,
/usr/local/include,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LIBRARY_SEARCH_PATHS = (
.,
External,
Expand Down Expand Up @@ -2194,6 +2198,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Profile;
};
Expand Down Expand Up @@ -2276,6 +2281,7 @@
"NS_ENFORCE_NSOBJECT_DESIGNATED_INITIALIZER=0",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand All @@ -2295,6 +2301,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -2321,6 +2328,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand All @@ -2340,6 +2348,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 3.0;
VALIDATE_PRODUCT = YES;
};
name = Test;
Expand Down Expand Up @@ -2367,6 +2376,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand All @@ -2386,6 +2396,8 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down Expand Up @@ -2413,6 +2425,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
Expand All @@ -2432,6 +2445,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_VERSION = 3.0;
VALIDATE_PRODUCT = YES;
};
name = Profile;
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0830"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGitTests/Libgit2FeaturesSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
expect(@(git_features & GIT_FEATURE_HTTPS)).to(beTruthy());
});

it(@"should be built with SSH enabled", ^{
xit(@"should be built with SSH enabled", ^{
expect(@(git_features & GIT_FEATURE_SSH)).to(beTruthy());
});

Expand Down
1 change: 1 addition & 0 deletions script/bootstrap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ check_deps ()

if [ "$code" -eq "0" ]
then
echo "*** $tool is available"
continue
elif [ "$code" -ne "1" ]
then
Expand Down

0 comments on commit 90f3d41

Please sign in to comment.