about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-06-05 15:48:25 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-06-05 16:41:03 +0000
commitaeac484d18f285e0f647348a36d897d2e0aff38b (patch)
tree2b2e7af350dd8ee18938e04b9ef23efad24d5426
parent76900705e8a54e8058a7d8f95da7fb873082c298 (diff)
downloadrust-aeac484d18f285e0f647348a36d897d2e0aff38b.tar.gz
rust-aeac484d18f285e0f647348a36d897d2e0aff38b.zip
Run tests with LLVM sysroot in CI
-rw-r--r--.github/workflows/main.yml15
1 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ed562d6ebe4..5dbdc00004e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -93,12 +93,6 @@ jobs:
     - name: Prepare dependencies
       run: ./y.rs prepare
 
-    - name: Build without unstable features
-      env:
-        TARGET_TRIPLE: ${{ matrix.env.TARGET_TRIPLE }}
-      # This is the config rust-lang/rust uses for builds
-      run: ./y.rs build --no-unstable-features
-
     - name: Build
       run: ./y.rs build --sysroot none
 
@@ -107,6 +101,15 @@ jobs:
         TARGET_TRIPLE: ${{ matrix.env.TARGET_TRIPLE }}
       run: ./y.rs test
 
+    - name: Install LLVM standard library
+      run: rustup target add ${{ matrix.env.TARGET_TRIPLE }}
+
+    # This is roughly config rust-lang/rust uses for testing
+    - name: Test with LLVM sysroot
+      env:
+        TARGET_TRIPLE: ${{ matrix.env.TARGET_TRIPLE }}
+      run: ./y.rs test --sysroot llvm --no-unstable-features
+
 
   # This job doesn't use cg_clif in any way. It checks that all cg_clif tests work with cg_llvm too.
   test_llvm: