|
51 | 51 | # This must consist of two words separated by a hyphen.
|
52 | 52 | # The first word will be used in reports, the second
|
53 | 53 | # will be removed.
|
54 |
| - armMacRunerTag: 'macosarm-internal' |
| 54 | + runnerTagMacArm64: 'macosarm-custom' |
55 | 55 |
|
56 | 56 | jobs:
|
57 | 57 | check_and_prepare:
|
|
70 | 70 | xcode_version: ${{ steps.matrix_config.outputs.xcode_version }}
|
71 | 71 | ios_device: ${{ steps.matrix_config.outputs.ios_device }}
|
72 | 72 | tvos_device: ${{ steps.matrix_config.outputs.tvos_device }}
|
73 |
| - steps: |
| 73 | + runner_tag_mac_arm64: ${{ env.runnerTagMacArm64 }} |
| 74 | + steps: |
74 | 75 | ### Fail the workflow if the user does not have admin access to run the tests.
|
75 | 76 | - name: Check if user has permission to trigger tests
|
76 | 77 | uses: lannonbr/repo-permission-check-action@2.0.0
|
@@ -344,7 +345,7 @@ jobs:
|
344 | 345 | # Special handling for MacOS ARM build.
|
345 | 346 | artifact_os=${{ matrix.os }}
|
346 | 347 | if [[ "${{ matrix.os }}" == "macos-latest" && "${{ matrix.arch }}" == "arm64" ]]; then
|
347 |
| - artifact_os='${{ env.armMacRunerTag }}' |
| 348 | + artifact_os='${{ needs.check_and_prepare.outputs.runner_tag_mac_arm64 }}' |
348 | 349 | additional_flags+=(--arch arm64)
|
349 | 350 | fi
|
350 | 351 | echo "::set-output name=artifact_name::desktop-${artifact_os}-${{ matrix.ssl_variant }}"
|
@@ -798,7 +799,7 @@ jobs:
|
798 | 799 | # Unlike the other matrices, we don't set a matrix.os here. Instead,
|
799 | 800 | # specify the tag of the self-hosted runner (and of the testapps to run),
|
800 | 801 | # and the OS that the testapps were built on originally.
|
801 |
| - - runner_tag: ${{ env.armMacRunerTag }} |
| 802 | + - runner_tag: '${{ needs.check_and_prepare.outputs.runner_tag_mac_arm64 }}' |
802 | 803 | # Only run the steps if build_os was included in the list of target OSes.
|
803 | 804 | build_os: macos-latest
|
804 | 805 | steps:
|
|
0 commit comments