Skip to content

Commit 5581499

Browse files
Cocoapods 1.7.0 multiproject support (b/128794527) (#2751)
1 parent f590c93 commit 5581499

File tree

45 files changed

+1301
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1301
-27
lines changed

.travis.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ cache:
55
- bundler
66
- cocoapods
77

8+
stages:
9+
- checks
10+
- test
11+
- name: cocoapods_compatibility_check
12+
if: type = cron
13+
814
jobs:
915
include:
1016
- stage: checks
@@ -212,6 +218,46 @@ jobs:
212218
script:
213219
- travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
214220

221+
# Validate Cocoapods configurations
222+
# This may take long time, so we would like to run it only once all other tests pass
223+
# Validate Cocoapods 1.7.0 compatibility
224+
- stage: cocoapods_compatibility_check
225+
env:
226+
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_frameworks
227+
script:
228+
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
229+
230+
- stage: cocoapods_compatibility_check
231+
env:
232+
- POD_CONFIG_DIR=Cocoapods1_7_0_frameworks
233+
script:
234+
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
235+
236+
- stage: cocoapods_compatibility_check
237+
env:
238+
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_staticLibs
239+
script:
240+
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
241+
242+
- stage: cocoapods_compatibility_check
243+
env:
244+
- POD_CONFIG_DIR=Cocoapods1_7_0_staticLibs
245+
script:
246+
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
247+
248+
# Validate Cocoapods 1.6.1 compatibility
249+
- stage: cocoapods_compatibility_check
250+
env:
251+
- POD_CONFIG_DIR=Cocoapods1_6_1_frameworks
252+
script:
253+
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
254+
255+
- stage: cocoapods_compatibility_check
256+
env:
257+
- POD_CONFIG_DIR=Cocoapods1_6_1_staticLibs
258+
script:
259+
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
260+
215261
allow_failures:
216262
# Run fuzz tests only on cron jobs.
217263
- stage: test

0 commit comments

Comments
 (0)