Skip to content

Commit 515da2d

Browse files
paulb777paulb777
authored
Remove travis jobs now running in GHA (#4846)
* more matrix
1 parent 9cb98ac commit 515da2d

File tree

3 files changed

+29
-70
lines changed

3 files changed

+29
-70
lines changed

‎.github/workflows/core.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,25 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Setup Bundler
22-
run: ./scripts/setup_bundler.sh
22+
run: scripts/setup_bundler.sh
2323
- name: Build and test
24-
run: ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=${{ matrix.target }}
24+
run: scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=${{ matrix.target }}
25+
26+
core-cron-only:
27+
runs-on: macos-latest
28+
if: github.event_name == 'schedule'
29+
strategy:
30+
matrix:
31+
target: [ios, tvos, macos]
32+
flags: [
33+
'--use_modular_headers',
34+
# Tests are skipped since the Swift tests need modules.
35+
'--skip-tests --use_libraries'
36+
]
37+
needs: pod_lib_lint
38+
steps:
39+
- uses: actions/checkout@v2
40+
- name: Setup Bundler
41+
run: scripts/setup_bundler.sh
42+
- name: PodLibLint Core Cron
43+
run: scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.github/workflows/datatransport.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,22 @@ jobs:
2727
2828
# Scheduled jobs
2929

30-
datatransport-use-libraries:
30+
datatransport-cron-only:
3131
runs-on: macos-latest
3232
if: github.event_name == 'schedule'
3333
strategy:
3434
matrix:
3535
target: [ios, tvos, macos]
36+
flags: [
37+
'--use_modular_headers',
38+
'--use_libraries'
39+
]
3640
needs: pod_lib_lint
3741
steps:
3842
- uses: actions/checkout@v2
3943
- name: Setup Bundler
4044
run: ./scripts/setup_bundler.sh
41-
- name: PodLibLint DataTransport Using Libraries
45+
- name: PodLibLint DataTransport Cron
4246
run: |
43-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=${{ matrix.target }} --use-libraries
44-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=${{ matrix.target }} --use-libraries
45-
46-
datatransport-use-modular-headers:
47-
runs-on: macos-latest
48-
if: github.event_name == 'schedule'
49-
strategy:
50-
matrix:
51-
target: [ios, tvos, macos]
52-
needs: pod_lib_lint
53-
steps:
54-
- uses: actions/checkout@v2
55-
- name: Setup Bundler
56-
run: ./scripts/setup_bundler.sh
57-
- name: PodLibLint DataTransport Using Modular Headers
58-
run: |
59-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=${{ matrix.target }} --use-modular-headers
60-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=${{ matrix.target }} --use-modular-headers
47+
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
48+
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.travis.yml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ jobs:
3333
env:
3434
- PROJECT=Core METHOD=pod-lib-lint
3535
script:
36-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=ios
37-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=tvos
38-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=macos
3936
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=ios
4037
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=tvos
4138
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=macos
@@ -53,12 +50,6 @@ jobs:
5350
env:
5451
- PROJECT=CoreCron METHOD=pod-lib-lint
5552
script:
56-
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=ios --use-libraries --skip-tests
57-
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=tvos --use-libraries --skip-tests
58-
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=macos --use-libraries --skip-tests
59-
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=ios --use-modular-headers
60-
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=tvos --use-modular-headers
61-
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=macos --use-modular-headers
6253
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=ios --use-libraries
6354
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=tvos --use-libraries
6455
- travis_retry ./scripts/pod_lib_lint.rb FirebaseCoreDiagnostics.podspec --platforms=macos --use-libraries
@@ -207,10 +198,7 @@ jobs:
207198
before_install:
208199
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh
209200
script:
210-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDynamicLinks.podspec
211201
- travis_retry ./scripts/if_changed.sh ./scripts/test_quickstart.sh DynamicLinks
212-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDynamicLinks.podspec --use-libraries
213-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseDynamicLinks.podspec --use-modular-headers
214202

215203
- stage: test
216204
osx_image: xcode10.3
@@ -288,11 +276,7 @@ jobs:
288276
before_install:
289277
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh
290278
script:
291-
- travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
292-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=ios
293279
- travis_retry ./scripts/if_changed.sh ./scripts/test_quickstart.sh Storage
294-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=tvos
295-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=macos
296280

297281
- stage: test
298282
osx_image: xcode10.3
@@ -469,17 +453,6 @@ jobs:
469453
- travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-libraries
470454
- travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-modular-headers
471455

472-
- stage: test
473-
env:
474-
- PROJECT=GoogleDataTransport METHOD=pod-lib-lint
475-
script:
476-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios
477-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos
478-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos
479-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios
480-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos
481-
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos
482-
483456
- stage: test
484457
osx_image: xcode10.3
485458
env:
@@ -488,24 +461,6 @@ jobs:
488461
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios
489462
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios
490463

491-
- stage: test
492-
if: type = cron
493-
env:
494-
- PROJECT=GoogleDataTransportCron METHOD=pod-lib-lint
495-
script:
496-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios --use-libraries
497-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos --use-libraries
498-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos --use-libraries
499-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios --use-modular-headers
500-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos --use-modular-headers
501-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos --use-modular-headers
502-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios --use-libraries
503-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos --use-libraries
504-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos --use-libraries
505-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios --use-modular-headers
506-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos --use-modular-headers
507-
- travis_retry ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos --use-modular-headers
508-
509464
- stage: test
510465
env:
511466
- PROJECT=FirebasePod PLATFORM=iOS METHOD=xcodebuild
@@ -621,9 +576,6 @@ jobs:
621576
# The travis_wait is necessary because fuzzing runs for 40 minutes.
622577
- travis_wait 45 ./scripts/fuzzing_ci.sh
623578

624-
- env:
625-
- PROJECT=GoogleDataTransportIntegrationTest PLATFORM=iOS METHOD=xcodebuild
626-
627579
branches:
628580
only:
629581
- master

0 commit comments

Comments
 (0)