Test commit to try matrix-based TEST_PROTOCOL dispatch

graydon · Apr 10, 2024 · 03ca163 · 03ca163
1 parent 7eff8a1
commit 03ca163
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -78,6 +78,7 @@ jobs:
     strategy:
       matrix:
         rust: [msrv, latest]
+        test-protocol: [20, 21]
         sys:
         - os: ubuntu-latest
           target: wasm32-unknown-unknown
@@ -114,9 +115,9 @@ jobs:
         version: 0.5.28
     - run: cargo hack --each-feature clippy --locked --target ${{ matrix.sys.target }}
     - if: matrix.sys.test
-      run: TEST_PROTOCOL=20 cargo hack --each-feature test --profile test-opt --locked --target ${{ matrix.sys.target }}
-    - if: matrix.sys.test
-      run: TEST_PROTOCOL=21 cargo hack --each-feature test --profile test-opt --locked --target ${{ matrix.sys.target }}
+      run: cargo hack --each-feature test --profile test-opt --locked --target ${{ matrix.sys.target }}
+      - env:
+          TEST_PROTOCOL: ${{ matrix.test-protocol }}
 
   publish-dry-run:
     if: github.event_name == 'push' || startsWith(github.head_ref, 'release/')

diff --git a/soroban-env-host/src/test/host.rs b/soroban-env-host/src/test/host.rs
@@ -7,6 +7,15 @@ use crate::{
     Env, Host, HostError,
 };
 
+// This is just a temporary test to confirm that matrix-based env vars work
+// on github CI.
+#[test]
+fn check_test_protocol_is_21(env: &Env) {
+    let val = env.get("TEST_PROTOCOL").unwrap();
+    let val = val.to_u64().unwrap();
+    assert_eq!(val, 21);
+}
+
 #[test]
 fn invalid_object_handles() -> Result<(), HostError> {
     let create_host = || -> Result<Host, HostError> {