Permalink
Browse files

Fixing tests and Travis

  • Loading branch information...
1 parent 1deb5ad commit ac533dca64a90b2f70c938a006eba9c1a301ea35 @chrisballinger chrisballinger committed Sep 15, 2016
Showing with 64 additions and 11 deletions.
  1. +3 −6 .travis.yml
  2. +52 −0 ChatSecure.xcodeproj/project.pbxproj
  3. +1 −0 Podfile
  4. +1 −1 Podfile.lock
  5. +7 −4 README.md
View
@@ -8,7 +8,7 @@ git:
# Use sed to replace the SSH URL with the public URL, then initialize submodules
before_install:
- - bundle install # We still need CocoaPods 0.39.0
+ - bundle install # We need a pre-release CocoaPods version "1.1.0.rc.1"
- sed -i -e 's/git@github.com:/git:\/\/github.com\//' .gitmodules
- sed -i -e 's/git@github.com:/git:\/\/github.com\//' Podfile
- git submodule update --init --recursive
@@ -20,13 +20,10 @@ install:
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/CPAProxyDependencies.zip -d ./Submodules/CPAProxy/
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/OTRKitDependencies.zip -d ./Submodules/OTRKit/
- unzip -q ./ChatSecure-iOS-Precompiled-Dependencies/Pods.zip
- # We use precompiled dependencies for tests now
- #- export ARCHS="i386" # Only build CPAProxy dependencies for i386 to speed things up
- #- bash ./Submodules/CPAProxy/scripts/build-all.sh
- #- bash ./Submodules/OTRKit/scripts/build-all.sh
before_script:
- export COCOAPODS_DISABLE_DETERMINISTIC_UUIDS=1 # https://github.com/CocoaPods/CocoaPods/issues/3850
+ - bundle exec pod repo update
- bundle exec pod install
script:
- - xctool -workspace ChatSecure.xcworkspace -scheme ChatSecureTests -sdk iphonesimulator -arch i386 test
+ - xctool -workspace ChatSecure.xcworkspace -scheme ChatSecureTests -sdk iphonesimulator -arch x86_64 test
@@ -57,6 +57,7 @@
63F614DC1BB214660083A06A /* ChatSecureModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F614DB1BB214660083A06A /* ChatSecureModelTest.swift */; };
63FA130C1C8A4EB700AE33EF /* OTRMessagesCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63FA130B1C8A4EB700AE33EF /* OTRMessagesCollectionViewFlowLayout.swift */; };
7917DB5CE7D966147A4D1AB8 /* Pods_ChatSecureCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46AAC6968EC686E61C8E8EA4 /* Pods_ChatSecureCore.framework */; };
+ 7A6540ECCA04445E88F06962 /* Pods_ChatSecureCorePods_ChatSecureTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 281981F599E0F5C8397E6A3F /* Pods_ChatSecureCorePods_ChatSecureTests.framework */; };
D9227C241BA78E6B00B5E1D0 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D9227C231BA78E6B00B5E1D0 /* FontAwesome.ttf */; };
D9227C2D1BA7952100B5E1D0 /* ChatSecureCore.h in Headers */ = {isa = PBXBuildFile; fileRef = D9227C2C1BA7952100B5E1D0 /* ChatSecureCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
D9227C3F1BA7952100B5E1D0 /* ChatSecureCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9227C2A1BA7952100B5E1D0 /* ChatSecureCore.framework */; };
@@ -433,6 +434,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ 281981F599E0F5C8397E6A3F /* Pods_ChatSecureCorePods_ChatSecureTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ChatSecureCorePods_ChatSecureTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
31610826406FD0CB714045AD /* Pods_ChatSecureCorePods_ChatSecureCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ChatSecureCorePods_ChatSecureCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
46AAC6968EC686E61C8E8EA4 /* Pods_ChatSecureCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ChatSecureCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
63039E961B0D43FE007C9978 /* OTRXMPPServerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRXMPPServerListViewController.h; sourceTree = "<group>"; };
@@ -860,6 +862,7 @@
buildActionMask = 2147483647;
files = (
631E1E9F1C583B6900E263CD /* ChatSecureCore.framework in Frameworks */,
+ 7A6540ECCA04445E88F06962 /* Pods_ChatSecureCorePods_ChatSecureTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1561,6 +1564,7 @@
46AAC6968EC686E61C8E8EA4 /* Pods_ChatSecureCore.framework */,
9F52F68785B05428F442DF47 /* Pods_ChatSecureCorePods_ChatSecure.framework */,
31610826406FD0CB714045AD /* Pods_ChatSecureCorePods_ChatSecureCore.framework */,
+ 281981F599E0F5C8397E6A3F /* Pods_ChatSecureCorePods_ChatSecureTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -1771,9 +1775,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 6396AFC01A169D54009F3E6C /* Build configuration list for PBXNativeTarget "ChatSecureTests" */;
buildPhases = (
+ 77A00DC28BB2926A0668095F /* [CP] Check Pods Manifest.lock */,
6396AFAF1A169D54009F3E6C /* Sources */,
6396AFB01A169D54009F3E6C /* Frameworks */,
6396AFB11A169D54009F3E6C /* Resources */,
+ 3465A939CCAAAAC0480C0795 /* [CP] Embed Pods Frameworks */,
+ A32A5DF4737208630E1EA1F8 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -2029,6 +2036,21 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
+ 3465A939CCAAAAC0480C0795 /* [CP] Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "[CP] Embed Pods Frameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChatSecureCorePods-ChatSecureTests/Pods-ChatSecureCorePods-ChatSecureTests-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
4A17E470489F79ACE0124841 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -2057,6 +2079,36 @@
shellPath = /bin/sh;
shellScript = "python \"${SRCROOT}/OTRAssets/Strings/StringsConverter.py\"";
};
+ 77A00DC28BB2926A0668095F /* [CP] Check Pods Manifest.lock */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "[CP] Check Pods Manifest.lock";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
+ showEnvVarsInLog = 0;
+ };
+ A32A5DF4737208630E1EA1F8 /* [CP] Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "[CP] Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChatSecureCorePods-ChatSecureTests/Pods-ChatSecureCorePods-ChatSecureTests-resources.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
A6D5997FD889EEEABB9C430A /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
View
@@ -78,5 +78,6 @@ abstract_target 'ChatSecureCorePods' do
pod 'IOCipher/GCDWebServer', :path => 'Submodules/IOCipher/IOCipher.podspec'
target 'ChatSecureCore'
+ target 'ChatSecureTests'
target 'ChatSecure'
end
View
@@ -447,6 +447,6 @@ SPEC CHECKSUMS:
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
-PODFILE CHECKSUM: dd6c8a7ed7006ce4c0f0c66c82e25677751bce40
+PODFILE CHECKSUM: c643eeee089e78beaf39c3b1153623c43456bbc4
COCOAPODS: 1.1.0.rc.1
View
@@ -46,21 +46,24 @@ There's a more [full list of OTR clients on Wikipedia](https://en.wikipedia.org/
## Build Instructions
-You'll need [Cocoapods](http://cocoapods.org) for most of our dependencies.
+You'll need [Cocoapods](http://cocoapods.org) for most of our dependencies. Due to some issues with CocoaPods and Xcode 8, we need to use the pre-release version, which we'll install with `bundler` and our `Gemfile`.
- $ gem install cocoapods
+ $ ### gem install cocoapods # Until CocoaPods is fixed use the bundle command below instead.
+ $ bundle install
Download the source code and **don't forget** to pull down all of the submodules as well.
$ git clone https://github.com/ChatSecure/ChatSecure-iOS.git
$ cd ChatSecure-iOS/
$ git submodule update --init --recursive
-Now you'll need to build the dependencies. During this process we will automatically verify the integity of each package by checking its GPG signature. Install [GPGTools](https://gpgtools.org) and add the public signing keys for OpenSSL, GnuPG, libevent, and libotr. *(TODO make these links to the keys)*
+Now you'll need to build the dependencies.
$ bash ./Submodules/CPAProxy/scripts/build-all.sh
$ bash ./Submodules/OTRKit/scripts/build-all.sh
- $ pod install
+ $ ### pod install # Until CocoaPods is fixed use the bundle commands below instead.
+ $ bundle exec pod repo update
+ $ bundle exec pod install
Next you'll need to create your own version of environment-specific data. Make a copy of `Secrets-template.plist` as `Secrets.plist`:

0 comments on commit ac533dc

Please sign in to comment.