Skip to content

Commit

Permalink
ci: defer the Solaris job until after tier 1
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
tgross35 committed Nov 20, 2024
1 parent 769bc10 commit 4a7cde5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ jobs:
- name: Execute run-docker.sh
run: ./ci/run-docker.sh ${{ matrix.target }}

solaris:
name: Solaris
test_tier2_vm:
name: Test tier2 VM
needs: [test_tier1, style_check]
runs-on: ubuntu-latest
strategy:
fail-fast: true
Expand All @@ -150,10 +151,9 @@ jobs:
mem: 4096
copyback: false
prepare: |
set -x
source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
echo "~~~~ rustc --version ~~~~"
rustc --version
echo "~~~~ Solaris-version ~~~~"
uname -a
run: |
export PATH=$HOME/.rust_solaris/bin:$PATH
Expand All @@ -177,10 +177,10 @@ jobs:
name: success
runs-on: ubuntu-22.04
needs:
- style_check
- test_tier1
- test_tier2
- solaris
- style_check
- test_tier2_vm
- verify_build
# Github branch protection is exceedingly silly and treats "jobs skipped because a dependency
# failed" as success. So we have to do some contortions to ensure the job fails if any of its
Expand Down

0 comments on commit 4a7cde5

Please sign in to comment.