try

jurteam · Sep 16, 2023 · 74b66bb · 74b66bb
1 parent 92aece0
commit 74b66bb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,16 +10,36 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  setup:
+  install_toolchain:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
-
     - name: Set-Up
       run: sudo apt-get update && sudo apt-get install -f -y git clang curl libssl-dev llvm libudev-dev protobuf-compiler eatmydata
 
-  check:
+    - name: Cache toolchain
+      id: cache-rustup
+      uses: actions/cache@v3
+      with:
+        key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
+        path: |
+          ~/.cargo/
+          ~/.rustup/
+
+    - name: Install Rustup
+      id: install-rustup
+      if: steps.cache-rustup.outputs.cache-hit != 'true'
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+        source ~/.cargo/env
+        which rustup
+        rustup default stable
+        rustup update nightly
+        rustup update stable
+        rustup toolchain install nightly
+        rustup target add wasm32-unknown-unknown --toolchain nightly
+
+  build:
     runs-on: ubuntu-latest
     needs: [install_toolchain]
 
@@ -42,5 +62,7 @@ jobs:
     - name: Build
       run: SKIP_WASM_BUILD= eatmydata cargo check --all-targets --features runtime-benchmarks
 
+  test:
+    needs: [build]
     - name: Test
       run: SKIP_WASM_BUILD= eatmydata cargo test --workspace --features runtime-benchmarks -- --nocapture
diff --git a/.github/workflows/rustup.yml b/.github/workflows/rustup.yml
@@ -5,32 +5,3 @@ on:
   pull_request:
     branches: [ main, develop ]
 
-jobs:
-  install_toolchain:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set-Up
-      run: sudo apt-get update && sudo apt-get install -f -y git clang curl libssl-dev llvm libudev-dev protobuf-compiler eatmydata
-
-    - name: Cache toolchain
-      id: cache-rustup
-      uses: actions/cache@v3
-      with:
-        key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
-        path: |
-          ~/.cargo/
-          ~/.rustup/
-
-    - name: Install Rustup
-      id: install-rustup
-      if: steps.cache-rustup.outputs.cache-hit != 'true'
-      run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-        source ~/.cargo/env
-        which rustup
-        rustup default stable
-        rustup update nightly
-        rustup update stable
-        rustup toolchain install nightly
-        rustup target add wasm32-unknown-unknown --toolchain nightly