Skip to content

Commit 068be04

Browse files
committed
using env instead of input
1 parent 33326ce commit 068be04

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ on:
2424
description: 'CSV of desktop SSL variants to use'
2525
default: 'openssl,boringssl'
2626
required: true
27-
mobile_test_on:
28-
description: 'iOS/Android test on Real Device or Simulator'
29-
default: 'device'
3027
android_device:
3128
description: 'Android device model'
3229
default: 'flame'
@@ -53,6 +50,7 @@ env:
5350
statusLabelFailed: "tests: failed"
5451
statusLabelSucceeded: "tests: succeeded"
5552
statusCommentIdentifier: "integration-test-status-comment"
53+
mobileTestOn: "device"
5654

5755
jobs:
5856
check_trigger:
@@ -163,7 +161,6 @@ jobs:
163161
matrix_os: ${{ steps.export-result.outputs.matrix_os }}
164162
matrix_ssl: ${{ steps.export-result.outputs.matrix_ssl }}
165163
apis: ${{ steps.export-result.outputs.apis }}
166-
mobile_test_on: ${{ steps.export-result.outputs.mobile_test_on }}
167164
android_device: ${{ steps.export-result.outputs.android_device }}
168165
android_api: ${{ steps.export-result.outputs.android_api }}
169166
ios_device: ${{ steps.export-result.outputs.ios_device }}
@@ -197,7 +194,6 @@ jobs:
197194
else
198195
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}}" )"
199196
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}}" )"
201197
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}}" )"
202198
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}}" )"
203199
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:
341337
additional_flags+=(--cmake_flag=-DFIREBASE_USE_BORINGSSL=ON)
342338
fi
343339
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
345341
346342
- name: Run desktop integration tests
347343
if: matrix.target_platform == 'Desktop' && !cancelled()

0 commit comments

Comments
 (0)