Test V1

anza-xyz · Jan 29, 2025 · c7ffe70 · c7ffe70
1 parent 87aaaae
commit c7ffe70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,6 +79,10 @@ jobs:
             tidy: false
             os: ubuntu-latest
             env: {}
+          - name: sbf-solana-solana-v1
+            tidy: false
+            os: ubuntu-latest
+            env: {}
           - name: x86_64-gnu-tools
             os: ubuntu-latest
             env: {}
@@ -199,6 +203,9 @@ jobs:
           - name: sbf-solana-solana
             os: ubuntu-latest
             env: {}
+          - name: sbf-solana-solana-v1
+            os: ubuntu-latest
+            env: { }
     defaults:
       run:
         shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

diff --git a/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbf-solana-solana/Dockerfile
@@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 RUN PATH="${HOME}/.cargo/bin:${PATH}" \
     cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
-    --rev d6ae9918ef1bc1049dabc2ded490460515f777d4 \
+    --rev 3bbd9252ac68c1edb54d2a89fa6ee794a0bbd7c2 \
     --bin cargo-run-solana-tests --root /usr/local
 
 COPY scripts/sccache.sh /scripts/

diff --git a/src/ci/scripts/run-build-from-ci.sh b/src/ci/scripts/run-build-from-ci.sh
@@ -18,6 +18,9 @@ echo "::add-matcher::src/ci/github-actions/problem_matchers.json"
 rustup self uninstall -y || true
 if [ -z "${IMAGE+x}" ]; then
     src/ci/run.sh
+elif [ "$IMAGE" == "sbf-solana-solana-v1"]
+    sed -i -e 's/.. Default::default()/cpu: "v1".into(), \n \t\t.. Default::default()/g' compiler/rustc_target/src/spec/base/sbf_base.rs
+    src/ci/docker/run.sh "${IMAGE}"
 else
     src/ci/docker/run.sh "${IMAGE}"
 fi