Skip to content

Commit 549eb77

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.
1 parent 33582fc commit 549eb77

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/ci.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ jobs:
131131
- name: Execute run-docker.sh
132132
run: ./ci/run-docker.sh ${{ matrix.target }}
133133

134-
solaris:
135-
name: Solaris
134+
test_tier2_vm:
135+
name: Test tier2 VM
136+
needs: [test_tier1, style_check]
136137
runs-on: ubuntu-latest
137138
strategy:
138139
fail-fast: true
@@ -149,10 +150,9 @@ jobs:
149150
mem: 4096
150151
copyback: false
151152
prepare: |
153+
set -x
152154
source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
153-
echo "~~~~ rustc --version ~~~~"
154155
rustc --version
155-
echo "~~~~ Solaris-version ~~~~"
156156
uname -a
157157
run: |
158158
export PATH=$HOME/.rust_solaris/bin:$PATH
@@ -176,10 +176,10 @@ jobs:
176176
name: success
177177
runs-on: ubuntu-22.04
178178
needs:
179+
- style_check
179180
- test_tier1
180181
- test_tier2
181-
- solaris
182-
- style_check
182+
- test_tier2_vm
183183
- verify_build
184184
# Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
185185
# failed" as success. So we have to do some contortions to ensure the job fails if any of its

0 commit comments

Comments
 (0)