Skip to content

Commit a33111f

Browse files
authored
Update to checkout@v2, add target matrix (#4805)
1 parent cf523b0 commit a33111f

File tree

1 file changed

+24
-53
lines changed

1 file changed

+24
-53
lines changed

.github/workflows/datatransport.yml

Lines changed: 24 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -11,79 +11,50 @@ on:
1111
- cron: '0 7 * * *'
1212

1313
jobs:
14-
datatransport-ios:
14+
pod_lib_lint:
1515
runs-on: macos-latest
16+
strategy:
17+
matrix:
18+
target: [ios, tvos, macos]
1619
steps:
17-
- uses: actions/checkout@v1
20+
- uses: actions/checkout@v2
1821
- name: Setup Bundler
1922
run: ./scripts/setup_bundler.sh
20-
- name: PodLibLint iOS
23+
- name: PodLibLint DataTransport
2124
run: |
22-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios
23-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios
24-
25-
datatransport-macos:
26-
runs-on: macos-latest
27-
steps:
28-
- uses: actions/checkout@v1
29-
- name: Setup Bundler
30-
run: ./scripts/setup_bundler.sh
31-
- name: PodLibLint macOS
32-
run: |
33-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos
34-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos
35-
36-
datatransport-tvos:
37-
runs-on: macos-latest
38-
steps:
39-
- uses: actions/checkout@v1
40-
- name: Setup Bundler
41-
run: ./scripts/setup_bundler.sh
42-
- name: PodLibLint tvOS
43-
run: |
44-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos
45-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos
25+
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=${{ matrix.target }}
26+
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=${{ matrix.target }}
4627
4728
# Scheduled jobs
4829

4930
datatransport-use-libraries:
5031
runs-on: macos-latest
5132
if: github.event_name == 'schedule'
52-
needs: [datatransport-ios, datatransport-macos, datatransport-tvos]
33+
strategy:
34+
matrix:
35+
target: [ios, tvos, macos]
36+
needs: pod_lib_lint
5337
steps:
54-
- uses: actions/checkout@v1
38+
- uses: actions/checkout@v2
5539
- name: Setup Bundler
5640
run: ./scripts/setup_bundler.sh
57-
- name: PodLibLint iOS
41+
- name: PodLibLint DataTransport Using Libraries
5842
run: |
59-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios --use-libraries
60-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios --use-libraries
61-
- name: PodLibLint macOS
62-
run: |
63-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos --use-libraries
64-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos --use-libraries
65-
- name: PodLibLint tvOS
66-
run: |
67-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos --use-libraries
68-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos --use-libraries
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
6945
7046
datatransport-use-modular-headers:
7147
runs-on: macos-latest
7248
if: github.event_name == 'schedule'
73-
needs: [datatransport-ios, datatransport-macos, datatransport-tvos]
49+
strategy:
50+
matrix:
51+
target: [ios, tvos, macos]
52+
needs: pod_lib_lint
7453
steps:
75-
- uses: actions/checkout@v1
54+
- uses: actions/checkout@v2
7655
- name: Setup Bundler
7756
run: ./scripts/setup_bundler.sh
78-
- name: PodLibLint iOS
79-
run: |
80-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios --use-modular-headers
81-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios --use-modular-headers
82-
- name: PodLibLint macOS
83-
run: |
84-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=macos --use-modular-headers
85-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=macos --use-modular-headers
86-
- name: PodLibLint tvOS
57+
- name: PodLibLint DataTransport Using Modular Headers
8758
run: |
88-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=tvos --use-modular-headers
89-
./scripts/third_party/travis/retry.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=tvos --use-modular-headers
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

0 commit comments

Comments
 (0)