From 549eb77fb1b59cb8e5e094761a5c47988348bbb7 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Wed, 20 Nov 2024 07:19:12 -0500
Subject: [PATCH] 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.
---
 .github/workflows/ci.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 42405035b7413..cbc05c454580f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -131,8 +131,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
@@ -149,10 +150,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
@@ -176,10 +176,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