Skip to content

Commit 70c823e

Browse files
committed
test(ci): perform self-hosted pre-req install off runner-independent var
previously I was using something that was potentially changing per-runner to detect if I needed to install pre-reqs, now I'm using a more generic macos? + self-hosted? check
1 parent 89f2d02 commit 70c823e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/build-quick.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
- name: Install macos self-hosted pre-requisites
135135
# All platforms require cargo to build correctly, but our self-hosted tartelet
136136
# image doesn't have cargo (or rustup) installed by default. Easily fixed
137-
if: contains(matrix.os, 'macos-tartelet')
137+
if: contains(runner.environment, 'self-hosted') && contains(runner.os, 'macOS')
138138
run: |
139139
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
140140
echo "$HOME/.cargo/bin" >> $GITHUB_PATH

.github/workflows/build-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
- name: Install macos self-hosted pre-requisites
7373
# All platforms require cargo to build correctly, but our self-hosted tartelet
7474
# image doesn't have cargo (or rustup) installed by default. Easily fixed
75+
if: contains(runner.environment, 'self-hosted') && contains(runner.os, 'macOS')
7576
run: |
7677
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
7778
echo "$HOME/.cargo/bin" >> $GITHUB_PATH

0 commit comments

Comments
 (0)