Skip to content

Commit 9f8f420

Browse files
committed
Move env to an output so it can be seen by the matrix
1 parent 895ef3d commit 9f8f420

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/integration_tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ env:
5151
# This must consist of two words separated by a hyphen.
5252
# The first word will be used in reports, the second
5353
# will be removed.
54-
armMacRunerTag: 'macosarm-internal'
54+
runnerTagMacArm64: 'macosarm-custom'
5555

5656
jobs:
5757
check_and_prepare:
@@ -70,7 +70,8 @@ jobs:
7070
xcode_version: ${{ steps.matrix_config.outputs.xcode_version }}
7171
ios_device: ${{ steps.matrix_config.outputs.ios_device }}
7272
tvos_device: ${{ steps.matrix_config.outputs.tvos_device }}
73-
steps:
73+
runner_tag_mac_arm64: ${{ env.runnerTagMacArm64 }}
74+
steps:
7475
### Fail the workflow if the user does not have admin access to run the tests.
7576
- name: Check if user has permission to trigger tests
7677
uses: lannonbr/repo-permission-check-action@2.0.0
@@ -344,7 +345,7 @@ jobs:
344345
# Special handling for MacOS ARM build.
345346
artifact_os=${{ matrix.os }}
346347
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 }}'
348349
additional_flags+=(--arch arm64)
349350
fi
350351
echo "::set-output name=artifact_name::desktop-${artifact_os}-${{ matrix.ssl_variant }}"
@@ -798,7 +799,7 @@ jobs:
798799
# Unlike the other matrices, we don't set a matrix.os here. Instead,
799800
# specify the tag of the self-hosted runner (and of the testapps to run),
800801
# 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 }}'
802803
# Only run the steps if build_os was included in the list of target OSes.
803804
build_os: macos-latest
804805
steps:

0 commit comments

Comments
 (0)