Skip to content

Commit 4a7cde5

Browse files
committed
ci: defer the Solaris job until after tier 1
Solaris is a Tier 2 target so defer it until after tier1 completes. We currently do this for the other T2 targets. In preparation of adding other VM tests to the matrix, adjust naming. Additionally, just `set -x` rather than priting the commands before running them. (backport <#4124>) (cherry picked from commit 549eb77)
1 parent 769bc10 commit 4a7cde5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ jobs:
132132
- name: Execute run-docker.sh
133133
run: ./ci/run-docker.sh ${{ matrix.target }}
134134

135-
solaris:
136-
name: Solaris
135+
test_tier2_vm:
136+
name: Test tier2 VM
137+
needs: [test_tier1, style_check]
137138
runs-on: ubuntu-latest
138139
strategy:
139140
fail-fast: true
@@ -150,10 +151,9 @@ jobs:
150151
mem: 4096
151152
copyback: false
152153
prepare: |
154+
set -x
153155
source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
154-
echo "~~~~ rustc --version ~~~~"
155156
rustc --version
156-
echo "~~~~ Solaris-version ~~~~"
157157
uname -a
158158
run: |
159159
export PATH=$HOME/.rust_solaris/bin:$PATH
@@ -177,10 +177,10 @@ jobs:
177177
name: success
178178
runs-on: ubuntu-22.04
179179
needs:
180+
- style_check
180181
- test_tier1
181182
- test_tier2
182-
- solaris
183-
- style_check
183+
- test_tier2_vm
184184
- verify_build
185185
# Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
186186
# failed" as success. So we have to do some contortions to ensure the job fails if any of its

0 commit comments

Comments
 (0)