use common actoin to setup rust with cargo cache enabled

0glabs · Jan 29, 2024 · b9907f9 · b9907f9
1 parent a4abe2b
commit b9907f9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 82 deletions.
diff --git a/.github/workflows/cc.yml b/.github/workflows/cc.yml
@@ -15,25 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Cargo cache
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-        key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.lock') }}
-
-    - name: Install 1.71.0 toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: 1.71.0
-        override: true
+    - uses: .github/workflows/setup-rust.yml
 
     - name: Run unittest
       run: cargo test --all-features --no-fail-fast

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -20,50 +20,18 @@ jobs:
     name: check
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
+      - uses: .github/workflows/setup-rust.yml
       - name: Run cargo check
         uses: actions-rs/cargo@v1
         with:
           command: check
+          args: --release
 
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Cargo cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
+      - uses: .github/workflows/setup-rust.yml
       - name: Run cargo test
         uses: actions-rs/cargo@v1
         with:
@@ -74,25 +42,12 @@ jobs:
     name: lints
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
-
+      - uses: .github/workflows/setup-rust.yml
       - name: Run cargo fmt
         uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: --all -- --check
-
       - name: Run cargo clippy
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/setup-rust.yml b/.github/workflows/setup-rust.yml
@@ -0,0 +1,26 @@
+name: Setup Rust
+runs:
+  using: composite
+  steps:
+    - name: Checkout sources
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Cargo cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Install stable toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        components: rustfmt, clippy
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,20 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-          submodules: recursive
-
-    - name: Cargo cache
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+    - uses: .github/workflows/setup-rust.yml
 
     - name: Build
       run: cargo build --release --verbose