|
24 | 24 | description: 'CSV of desktop SSL variants to use'
|
25 | 25 | default: 'openssl,boringssl'
|
26 | 26 | required: true
|
27 |
| - mobile_test_on: |
28 |
| - description: 'iOS/Android test on Real Device or Simulator' |
29 |
| - default: 'device' |
30 | 27 | android_device:
|
31 | 28 | description: 'Android device model'
|
32 | 29 | default: 'flame'
|
|
53 | 50 | statusLabelFailed: "tests: failed"
|
54 | 51 | statusLabelSucceeded: "tests: succeeded"
|
55 | 52 | statusCommentIdentifier: "integration-test-status-comment"
|
| 53 | + mobileTestOn: "device" |
56 | 54 |
|
57 | 55 | jobs:
|
58 | 56 | check_trigger:
|
@@ -163,7 +161,6 @@ jobs:
|
163 | 161 | matrix_os: ${{ steps.export-result.outputs.matrix_os }}
|
164 | 162 | matrix_ssl: ${{ steps.export-result.outputs.matrix_ssl }}
|
165 | 163 | apis: ${{ steps.export-result.outputs.apis }}
|
166 |
| - mobile_test_on: ${{ steps.export-result.outputs.mobile_test_on }} |
167 | 164 | android_device: ${{ steps.export-result.outputs.android_device }}
|
168 | 165 | android_api: ${{ steps.export-result.outputs.android_api }}
|
169 | 166 | ios_device: ${{ steps.export-result.outputs.ios_device }}
|
@@ -197,7 +194,6 @@ jobs:
|
197 | 194 | else
|
198 | 195 | echo "::set-output name=matrix_ssl::$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${EXPANDED_MATRIX_PARAM} -k ssl_lib -o "${{github.event.inputs.desktop_ssl_variants}}" )"
|
199 | 196 | fi
|
200 |
| - echo "::set-output name=mobile_test_on::$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k mobile_test_on -o "${{github.event.inputs.mobile_test_on}}" )" |
201 | 197 | echo "::set-output name=android_device::$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k android_device -o "${{github.event.inputs.android_device}}" )"
|
202 | 198 | echo "::set-output name=android_api::$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k android_api -o "${{github.event.inputs.android_api}}" )"
|
203 | 199 | echo "::set-output name=ios_device::$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k ios_device -o "${{github.event.inputs.ios_device}}" )"
|
@@ -341,7 +337,7 @@ jobs:
|
341 | 337 | additional_flags+=(--cmake_flag=-DFIREBASE_USE_BORINGSSL=ON)
|
342 | 338 | fi
|
343 | 339 | fi
|
344 |
| - python scripts/gha/build_testapps.py --t ${{ needs.prepare_matrix.outputs.apis }} --p ${{ matrix.target_platform }} --output_directory "${{ github.workspace }}" --ios_sdk "${{ needs.prepare_matrix.outputs.mobile_test_on }}" --noadd_timestamp ${additional_flags[*]} --short_output_paths |
| 340 | + python scripts/gha/build_testapps.py --t ${{ needs.prepare_matrix.outputs.apis }} --p ${{ matrix.target_platform }} --output_directory "${{ github.workspace }}" --ios_sdk "${{ env.mobileTestOn }}" --noadd_timestamp ${additional_flags[*]} --short_output_paths |
345 | 341 |
|
346 | 342 | - name: Run desktop integration tests
|
347 | 343 | if: matrix.target_platform == 'Desktop' && !cancelled()
|
|
0 commit comments