Skip to content

Commit 0e5f937

Browse files
authored
Add & enable expanded matrix for integration test workflow
1 parent c1841bb commit 0e5f937

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ jobs:
693693
with:
694694
python-version: '3.7'
695695
- name: Use expanded matrix
696-
if: github.event.inputs.use_expanded_matrix == '1'
696+
if: github.event_name == 'schedule' || github.event.inputs.use_expanded_matrix == '1'
697697
run: |
698698
echo "USE_EXPANDED_MATRIX=1" >> $GITHUB_ENV
699699
- name: Generate token for GitHub API

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,10 @@ jobs:
158158
fetch-depth: 0
159159
submodules: false
160160
- name: Use expanded matrix
161-
if: github.event.inputs.use_expanded_matrix == '1' || needs.check_trigger.outputs.requested_tests == 'full'
161+
if: github.event_name == 'schedule' || github.event.inputs.use_expanded_matrix == '1' || needs.check_trigger.outputs.requested_tests == 'full'
162162
run: |
163163
echo "EXPANDED_MATRIX_PARAM=-e=1" >> $GITHUB_ENV
164+
echo "::warning ::Running on the expanded matrix"
164165
- name: Set auto-diff option if specified.
165166
if: needs.check_trigger.outputs.requested_tests == 'auto'
166167
run: |

scripts/gha/print_matrix_configuration.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@
9999
"matrix": {
100100
"os": ["ubuntu-latest", "macos-latest", "windows-latest"],
101101
"platform": ["Desktop", "Android", "iOS", "tvOS"],
102-
"ssl_lib": ["openssl", "boringssl"],
102+
"ssl_lib": ["openssl"],
103103
"android_device": ["android_latest", "emulator_target"],
104104
"ios_device": ["ios_target", "simulator_target"],
105-
"tvos_device": ["tvos_simulator_target"],
105+
"tvos_device": ["tvos_simulator"],
106106
"build_type": ["Debug"],
107107
"architecture_windows_linux": ["x64"],
108108
"architecture_macos": ["x64"],
@@ -113,6 +113,13 @@
113113
"ndk_version": ["r22b"],
114114
"platform_version": ["28"],
115115
"build_tools_version": ["28.0.3"],
116+
117+
EXPANDED_KEY: {
118+
"ssl_lib": ["openssl", "boringssl"],
119+
"android_device": ["android_min", "android_latest", "android_latest", "emulator_min", "emulator_target", "emulator_latest"],
120+
"ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
121+
"tvos_device": ["tvos_simulator"],
122+
}
116123
},
117124
"config": {
118125
"apis": "admob,analytics,auth,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage",
@@ -156,7 +163,7 @@
156163
"simulator_min": {"type": "virtual", "name":"iPhone 6", "version":"11.4"},
157164
"simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"12.0"},
158165
"simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"14.4"},
159-
"tvos_simulator_target": {"type": "virtual", "name":"Apple TV", "version":"14.0"},
166+
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.0"},
160167
}
161168

162169

0 commit comments

Comments
 (0)