Skip to content

Commit cf5d8dd

Browse files
Testing Trigger Compat Suite (#66)
* Travis.yml added. * Updated test-app tag. * Updated .travis.yml * Inverted run compat-suite condition. * ci(travis): add travisci-tools * for testing * force linux os * skip srcclr * not able to skip srcclr * restore original settings * skip srcclr we can terminate now since we arent using darwin anymore * Pod install updated. * Scheme names updated. * Universal schemes deleted from travis.yml * Deployment target changed to 12.0 * Removing @testable from import statements. * reverted modern build system. * Xcode version updated. * 1. Search paths updated. 2. ONLY_ACTIVE_ARCH set to no. * Reverting some changes. * Reverted os version to 12.0 * Podfile updated. * changes to podfile reverted. * try to fix tests on travis * Updating testapp branch for testing. * Reverting TESTAPP_TAG tag to master. * 1. Deployment target changed to 9.0 2. XCode updated to 10.2 3. Event dispatcher tests commented * XCode reverted to 10 from 10.2 * XCode updated to 10.2. Pod versions made constant for swifty-json and mixpanel-swift. * fix to run on travis. change deploy target to 10 for tests, remove use_framework as it is not necessary, cleanu tests so that included in only one project * fix travis swift-sdk build * switching back to xcode 10.1 * egrep removed * xcpretty added * turn off code coverage and don't include threading tests * put egrep back in. * fix travis yml * add tests and fix travis build * remove quiet from xcodetest
1 parent 043d3f2 commit cf5d8dd

File tree

14 files changed

+200
-232
lines changed

14 files changed

+200
-232
lines changed

.travis.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
language: swift
2+
osx_image: xcode10.1
3+
branches:
4+
only:
5+
- master
6+
env:
7+
matrix:
8+
- SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=9.1 NAME='iPad Air'
9+
- SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.1 NAME='iPhone 7 Plus'
10+
- SCHEME=OptimizelySwiftSDK-iOS TEST_SDK=iphonesimulator PLATFORM='iOS Simulator' OS=10.3.1 NAME='iPhone 7'
11+
- SCHEME=OptimizelySwiftSDK-tvOS TEST_SDK=appletvsimulator PLATFORM='tvOS Simulator' OS=10.2 NAME='Apple TV 1080p'
12+
before_install:
13+
- gem install slather --no-document --quiet
14+
install: pod install --repo-update
15+
addons:
16+
srcclr: true
17+
script:
18+
- pod spec lint --quick
19+
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then xcodebuild test -workspace OptimizelySDK.xcworkspace -scheme $SCHEME -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk $TEST_SDK -destination "platform=$PLATFORM,OS=$OS,name=$NAME" ONLY_ACTIVE_ARCH=YES | xcpretty; fi
20+
after_success:
21+
- slather
22+
- sleep 5 # https://github.com/travis-ci/travis-ci/issues/4725
23+
24+
# Integration tests need to run first to reset the PR build status to pending
25+
stages:
26+
- 'Integration tests'
27+
- 'Test'
28+
29+
jobs:
30+
include:
31+
- stage: 'Integration tests'
32+
if: env(RUN_COMPAT_SUITE) = true
33+
env:
34+
- SDK=swift
35+
- BUILD_NUMBER=$TRAVIS_BUILD_NUMBER
36+
- TESTAPP_TAG=master
37+
cache: false
38+
language: minimal
39+
os: linux
40+
install:
41+
- mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://$CI_USER_TOKEN@github.com/optimizely/travisci-tools.git && popd
42+
script:
43+
- "$HOME/travisci-tools/fsc-trigger/trigger_fullstack-sdk-compat.sh"
44+
after_success: travis_terminate 0

DemoObjCApp/DemoObjcApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
361EF872CB7D0F6C8202145F /* Pods_DemoObjciOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E188D7982AFD9C7F1C7FE6 /* Pods_DemoObjciOS.framework */; };
11+
6923C05F4FFD7394581F4361 /* libPods-DemoObjctvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE090EEBD47E05884C417C0 /* libPods-DemoObjctvOS.a */; };
1112
6E4DD7F721E51E5500B0C2C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EF7499F21E404BC008B22A0 /* main.m */; };
1213
6E4DD7F821E51E5600B0C2C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EF7499F21E404BC008B22A0 /* main.m */; };
1314
6E4DD97C21E67AAD00B0C2C7 /* OptimizelySwiftSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4DD97521E67A6500B0C2C7 /* OptimizelySwiftSDK.framework */; };
@@ -36,7 +37,6 @@
3637
6E9681D921EFA5B2009B7FEC /* CustomLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E9681D721EFA5B2009B7FEC /* CustomLogger.m */; };
3738
6EB8456B21EE5DE3005346CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456421EE5DE3005346CC /* AppDelegate.m */; };
3839
6EB8456C21EE5DE3005346CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EB8456421EE5DE3005346CC /* AppDelegate.m */; };
39-
DDB0B21C9FF18EAEA9E5F676 /* Pods_DemoObjctvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3822AD03E75EF61F9556BA6 /* Pods_DemoObjctvOS.framework */; };
4040
/* End PBXBuildFile section */
4141

4242
/* Begin PBXContainerItemProxy section */
@@ -110,6 +110,7 @@
110110
/* End PBXCopyFilesBuildPhase section */
111111

112112
/* Begin PBXFileReference section */
113+
2CE090EEBD47E05884C417C0 /* libPods-DemoObjctvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DemoObjctvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
113114
3EFD1578D8AB431E6FD4B8FE /* Pods-DemoObjctvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoObjctvOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoObjctvOS/Pods-DemoObjctvOS.debug.xcconfig"; sourceTree = "<group>"; };
114115
4BE4886BF950708C866FA8F2 /* Pods-DemoObjciOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoObjciOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoObjciOS/Pods-DemoObjciOS.debug.xcconfig"; sourceTree = "<group>"; };
115116
6E4DD96D21E67A6500B0C2C7 /* OptimizelySwiftSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OptimizelySwiftSDK.xcodeproj; path = ../OptimizelySDK/OptimizelySwiftSDK.xcodeproj; sourceTree = "<group>"; };
@@ -137,7 +138,6 @@
137138
6EF7498E21E404BB008B22A0 /* DemoObjciOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoObjciOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
138139
6EF7499F21E404BC008B22A0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
139140
6EF749A821E404D6008B22A0 /* DemoObjctvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoObjctvOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
140-
B3822AD03E75EF61F9556BA6 /* Pods_DemoObjctvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoObjctvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
141141
D58542E1B5771327083E56E2 /* Pods-DemoObjctvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoObjctvOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoObjctvOS/Pods-DemoObjctvOS.release.xcconfig"; sourceTree = "<group>"; };
142142
D66FA87FA967DCE9F1972546 /* Pods-DemoObjciOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoObjciOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoObjciOS/Pods-DemoObjciOS.release.xcconfig"; sourceTree = "<group>"; };
143143
F8E188D7982AFD9C7F1C7FE6 /* Pods_DemoObjciOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoObjciOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -157,8 +157,8 @@
157157
isa = PBXFrameworksBuildPhase;
158158
buildActionMask = 2147483647;
159159
files = (
160-
DDB0B21C9FF18EAEA9E5F676 /* Pods_DemoObjctvOS.framework in Frameworks */,
161160
6E4DD98021E67ABA00B0C2C7 /* OptimizelySwiftSDK.framework in Frameworks */,
161+
6923C05F4FFD7394581F4361 /* libPods-DemoObjctvOS.a in Frameworks */,
162162
);
163163
runOnlyForDeploymentPostprocessing = 0;
164164
};
@@ -278,7 +278,7 @@
278278
children = (
279279
6E4DD96D21E67A6500B0C2C7 /* OptimizelySwiftSDK.xcodeproj */,
280280
F8E188D7982AFD9C7F1C7FE6 /* Pods_DemoObjciOS.framework */,
281-
B3822AD03E75EF61F9556BA6 /* Pods_DemoObjctvOS.framework */,
281+
2CE090EEBD47E05884C417C0 /* libPods-DemoObjctvOS.a */,
282282
);
283283
name = Frameworks;
284284
sourceTree = "<group>";

DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
2330F864C8154595434F8799 /* libPods-DemoSwifttvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2E0408D86A53942A6E2145 /* libPods-DemoSwifttvOS.a */; };
1011
25C6F3B621C95D1700C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; };
1112
25C6F3B721C95D1800C2EBDD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE21E55313B00931399 /* AppDelegate.swift */; };
1213
25C6F3B821C95D1A00C2EBDD /* FailureViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE31E55313B00931399 /* FailureViewController.swift */; };
@@ -17,7 +18,6 @@
1718
25C6F3BD21C95D2100C2EBDD /* VariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* VariationViewController.swift */; };
1819
25C6F3BF21C95D4800C2EBDD /* iOSMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA299EDD1E55312200931399 /* iOSMain.storyboard */; };
1920
3480ABB656D79B1C566F6E18 /* Pods_DemoSwiftiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC1D11D1794467F59480327F /* Pods_DemoSwiftiOS.framework */; };
20-
44BDBF4043EC53F85AF3D3DC /* Pods_DemoSwifttvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEB087C410B6A1210A021BC5 /* Pods_DemoSwifttvOS.framework */; };
2121
6E4DD95F21E679D500B0C2C7 /* OptimizelySwiftSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4DD95821E679B900B0C2C7 /* OptimizelySwiftSDK.framework */; };
2222
6E4DD96021E679D500B0C2C7 /* OptimizelySwiftSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4DD95821E679B900B0C2C7 /* OptimizelySwiftSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2323
6E4DD96721E67A3A00B0C2C7 /* OptimizelySwiftSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4DD95A21E679B900B0C2C7 /* OptimizelySwiftSDK.framework */; };
@@ -118,7 +118,7 @@
118118
6EF2CF1C21E4158A00A5D78D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/tvOSMain.storyboard; sourceTree = "<group>"; };
119119
9C185BE70FBE51067CFD104E /* Pods-DemoSwiftiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwiftiOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwiftiOS/Pods-DemoSwiftiOS.release.xcconfig"; sourceTree = "<group>"; };
120120
B301A636D5072557B288E62C /* Pods-DemoSwifttvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwifttvOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwifttvOS/Pods-DemoSwifttvOS.release.xcconfig"; sourceTree = "<group>"; };
121-
CEB087C410B6A1210A021BC5 /* Pods_DemoSwifttvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoSwifttvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
121+
DA2E0408D86A53942A6E2145 /* libPods-DemoSwifttvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DemoSwifttvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
122122
E4A4D2A6EBCC93081556F7A5 /* Pods-DemoSwiftiOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoSwiftiOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-DemoSwiftiOS/Pods-DemoSwiftiOS.debug.xcconfig"; sourceTree = "<group>"; };
123123
EA1E4AA51E5FD1C100BDDABD /* DemoSwiftApp-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DemoSwiftApp-Bridging-Header.h"; sourceTree = "<group>"; };
124124
EA299ED81E5530B800931399 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -146,8 +146,8 @@
146146
isa = PBXFrameworksBuildPhase;
147147
buildActionMask = 2147483647;
148148
files = (
149-
44BDBF4043EC53F85AF3D3DC /* Pods_DemoSwifttvOS.framework in Frameworks */,
150149
6E4DD96721E67A3A00B0C2C7 /* OptimizelySwiftSDK.framework in Frameworks */,
150+
2330F864C8154595434F8799 /* libPods-DemoSwifttvOS.a in Frameworks */,
151151
);
152152
runOnlyForDeploymentPostprocessing = 0;
153153
};
@@ -270,7 +270,7 @@
270270
children = (
271271
6E4DD95021E679B900B0C2C7 /* OptimizelySwiftSDK.xcodeproj */,
272272
EC1D11D1794467F59480327F /* Pods_DemoSwiftiOS.framework */,
273-
CEB087C410B6A1210A021BC5 /* Pods_DemoSwifttvOS.framework */,
273+
DA2E0408D86A53942A6E2145 /* libPods-DemoSwifttvOS.a */,
274274
);
275275
name = Frameworks;
276276
sourceTree = "<group>";

0 commit comments

Comments
 (0)