Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cocoapods 1.7.0 multiproject support (b/128794527) #2751

Merged
merged 44 commits into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a1665e1
CocoapodsIntegrationTest project introduced
maksymmalyhin Apr 4, 2019
9619835
Header imports updated to module style for external modules imports
maksymmalyhin Apr 4, 2019
c6abfe2
CocoapodsIntegrationTest - import a Firebase header to make sure comp…
maksymmalyhin Apr 4, 2019
2bd1a39
Cocopoads test script [WIP]
maksymmalyhin Apr 4, 2019
8fff785
CocoapodsIntegrationTest - simple run script
maksymmalyhin Apr 5, 2019
1d3a30e
Run cocopoads tests on Travis
maksymmalyhin Apr 5, 2019
c115bbd
Travis cocoapods tests - temporary enable
maksymmalyhin Apr 5, 2019
0669f61
Travis cocoapods tests - no before_install
maksymmalyhin Apr 5, 2019
046253e
Travis - fix file paths
maksymmalyhin Apr 5, 2019
9097700
Cocoapods tests - `bundle install --no-deployment`
maksymmalyhin Apr 5, 2019
91e3aa3
Non-default gemfile name
maksymmalyhin Apr 5, 2019
5aadc0b
Print cocoapods version
maksymmalyhin Apr 5, 2019
82c70af
Commit Gemfile.lock
maksymmalyhin Apr 5, 2019
3d1193e
Experiments with bundler
maksymmalyhin Apr 5, 2019
1d9e5a2
Update bundler environment
maksymmalyhin Apr 5, 2019
0c9993f
Unset BUNDLE_GEMFILE
maksymmalyhin Apr 5, 2019
5f3368d
Run xcodebuild
maksymmalyhin Apr 5, 2019
50becb1
cleanup and comments
maksymmalyhin Apr 5, 2019
b70c227
Check all Cocoapods configurations
maksymmalyhin Apr 5, 2019
6371394
fix check all
maksymmalyhin Apr 5, 2019
1636d03
Comments and usage
maksymmalyhin Apr 8, 2019
d96e0d6
Travis - run only build_all_environments.sh
maksymmalyhin Apr 8, 2019
834b1fb
Merge remote-tracking branch 'refs/remotes/origin/master'
maksymmalyhin Apr 8, 2019
3c8449c
Travis - Remove underscores from Cocoapods stage
maksymmalyhin Apr 8, 2019
d031023
Scripts comments
maksymmalyhin Apr 8, 2019
5da51aa
style.sh generated changes
maksymmalyhin Apr 8, 2019
f3a4502
Formatting
maksymmalyhin Apr 8, 2019
7a2576b
Trailing whitespaces
maksymmalyhin Apr 8, 2019
ba7d83a
Trailing whitespace
maksymmalyhin Apr 8, 2019
4b209aa
Licenses
maksymmalyhin Apr 8, 2019
fb5f7ab
Remove unused code from test project
maksymmalyhin Apr 8, 2019
85b27a4
Copyright
maksymmalyhin Apr 8, 2019
84b2b2f
Merge remote-tracking branch 'refs/remotes/origin/master'
maksymmalyhin Apr 8, 2019
150010f
GoogleUtilities changelog
maksymmalyhin Apr 8, 2019
068bfd2
Firestore: Fix MacOS example App
maksymmalyhin Apr 8, 2019
18a3694
Merge branch 'master' into mm/cocoapods-1_7
maksymmalyhin Apr 8, 2019
d56ba86
Remove if_changed for testing purposes
maksymmalyhin Apr 8, 2019
78975ae
Merge remote-tracking branch 'refs/remotes/origin/master'
maksymmalyhin Apr 8, 2019
58bbe3c
Travis - add Cocoapod tests manually
maksymmalyhin Apr 9, 2019
c150998
Travis fsyntax fixes
maksymmalyhin Apr 9, 2019
3005c13
Travis - place stages declarations at the top
maksymmalyhin Apr 9, 2019
c2ee4d6
Travis - command formatting
maksymmalyhin Apr 9, 2019
53204f7
typos
maksymmalyhin Apr 9, 2019
a23cb5c
Travis - cocoapods_compatibility_check only for cron builds
maksymmalyhin Apr 9, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ cache:
- bundler
- cocoapods

stages:
- checks
- test
- name: cocoapods_compatibility_check
if: type = cron

jobs:
include:
- stage: checks
Expand Down Expand Up @@ -212,6 +218,46 @@ jobs:
script:
- travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD

# Validate Cocoapods configurations
# This may take long time, so we would like to run it only once all other tests pass
# Validate Cocoapods 1.7.0 compatibility
- stage: cocoapods_compatibility_check
env:
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_frameworks
script:
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile

- stage: cocoapods_compatibility_check
env:
- POD_CONFIG_DIR=Cocoapods1_7_0_frameworks
script:
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile

- stage: cocoapods_compatibility_check
env:
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_staticLibs
script:
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile

- stage: cocoapods_compatibility_check
env:
- POD_CONFIG_DIR=Cocoapods1_7_0_staticLibs
script:
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile

# Validate Cocoapods 1.6.1 compatibility
- stage: cocoapods_compatibility_check
env:
- POD_CONFIG_DIR=Cocoapods1_6_1_frameworks
script:
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile

- stage: cocoapods_compatibility_check
env:
- POD_CONFIG_DIR=Cocoapods1_6_1_staticLibs
script:
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile

allow_failures:
# Run fuzz tests only on cron jobs.
- stage: test
Expand Down
Loading