Skip to content

Commit b00733d

Browse files
authored
Run CocoaPods tests in travis test stage (#2935)
* gitignore Gemfile.lock
1 parent 9c1035b commit b00733d

File tree

3 files changed

+15
-84
lines changed

3 files changed

+15
-84
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,6 @@ default.profraw
9191
# Firestore emulator
9292
cloud-firestore-emulator.log
9393
cloud-firestore-emulator.pid
94+
95+
# Let Gemfiles in CocoaPodsIntegrationTest float to catch issues asap
96+
CocoaPodsIntegrationTest/**/Gemfile.lock

.travis.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ cache:
88
stages:
99
- checks
1010
- test
11-
- name: cocoapods_compatibility_check
12-
if: type = cron
1311

1412
jobs:
1513
include:
@@ -241,38 +239,44 @@ jobs:
241239
# Validate Cocoapods configurations
242240
# This may take long time, so we would like to run it only once all other tests pass
243241
# Validate Cocoapods 1.7.0 compatibility
244-
- stage: cocoapods_compatibility_check
242+
- stage: test
243+
if: type = cron
245244
env:
246245
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_frameworks
247246
script:
248247
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
249248

250-
- stage: cocoapods_compatibility_check
249+
- stage: test
250+
if: type = cron
251251
env:
252252
- POD_CONFIG_DIR=Cocoapods1_7_0_frameworks
253253
script:
254254
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
255255

256-
- stage: cocoapods_compatibility_check
256+
- stage: test
257+
if: type = cron
257258
env:
258259
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_staticLibs
259260
script:
260261
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
261262

262-
- stage: cocoapods_compatibility_check
263+
- stage: test
264+
if: type = cron
263265
env:
264266
- POD_CONFIG_DIR=Cocoapods1_7_0_staticLibs
265267
script:
266268
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
267269

268270
# Validate Cocoapods 1.6.1 compatibility
269-
- stage: cocoapods_compatibility_check
271+
- stage: test
272+
if: type = cron
270273
env:
271274
- POD_CONFIG_DIR=Cocoapods1_6_1_frameworks
272275
script:
273276
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
274277

275-
- stage: cocoapods_compatibility_check
278+
- stage: test
279+
if: type = cron
276280
env:
277281
- POD_CONFIG_DIR=Cocoapods1_6_1_staticLibs
278282
script:

CocoapodsIntegrationTest/Gemfile.lock

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)