[SOL] CI: build and test sbf target

anza-xyz · Aug 22, 2024 · d05f5ec · d05f5ec
1 parent 3bcb531
commit d05f5ec
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
               ENABLE_GCC_CODEGEN: "1"
             os: ubuntu-20.04-16core-64gb
             env: {}
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-tools
@@ -193,7 +193,7 @@ jobs:
           - name: x86_64-gnu-llvm-10
             os: ubuntu-latest
             env: {}
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             os: ubuntu-latest
             env: {}
     timeout-minutes: 600

diff --git a/build.sh b/build.sh
@@ -19,4 +19,4 @@ esac
 if [ "$1" == "--llvm" ]; then
     rm -f build/${HOST_TRIPLE}/llvm/llvm-finished-building;
 fi
-./x.py build --stage 1 --target ${HOST_TRIPLE},bpfel-unknown-unknown
+./x.py build --stage 1 --target ${HOST_TRIPLE},bpfel-unknown-unknown,sbf-solana-solana
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
@@ -129,8 +129,9 @@ mod any;
 mod array;
 mod ascii;
 mod asserting;
+#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
 mod async_iter;
-#[cfg(not(target_arch = "bpf"))]
+#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
 mod atomic;
 mod bool;
 mod cell;

diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
@@ -118,6 +118,7 @@ ENV TARGETS=$TARGETS,aarch64-pc-windows-gnullvm
 ENV TARGETS=$TARGETS,i686-pc-windows-gnullvm
 ENV TARGETS=$TARGETS,x86_64-pc-windows-gnullvm
 ENV TARGETS=$TARGETS,bpfel-unknown-unknown
+ENV TARGETS=$TARGETS,sbf-solana-solana
 
 ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
     CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \

diff --git a/...t-x86_64/bpfel-unknown-unknown/Dockerfile → .../host-x86_64/sbf-solana-solana/Dockerfile b/...t-x86_64/bpfel-unknown-unknown/Dockerfile → .../host-x86_64/sbf-solana-solana/Dockerfile
@@ -32,7 +32,8 @@ ENV RUST_CONFIGURE_ARGS \
     --set llvm.clang
 
 ENV SCRIPT CARGO_TARGET_BPFEL_UNKNOWN_UNKNOWN_RUNNER=\"cargo-run-bpf-tests --heap-size 104857600\" \
+    CARGO_TARGET_SBF_SOLANA_SOLANA_RUNNER=\"cargo-run-bpf-tests --heap-size 104857600\" \
     LLVM_HOME=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm \
     PATH="${HOME}/.cargo/bin:${PATH}" \
-    python3 /checkout/x.py --stage 1 test --host='' --target bpfel-unknown-unknown \
+    python3 /checkout/x.py --stage 1 test --host='' --target bpfel-unknown-unknown,sbf-solana-solana \
     library/core
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -373,7 +373,7 @@ jobs:
               ENABLE_GCC_CODEGEN: "1"
             <<: *job-linux-16c
 
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             <<: *job-linux-xl
 
           - name: x86_64-gnu-tools
@@ -394,7 +394,7 @@ jobs:
           - name: x86_64-gnu-llvm-10
             <<: *job-linux-xl
 
-          - name: bpfel-unknown-unknown
+          - name: sbf-solana-solana
             <<: *job-linux-xl
 
   auto: