ci: Avoid actions from actions-rs

They aren't maintained all that well from what I can tell. In addition this reduces the risk of issues due to buggy updates. Supply chain attacks have already been mitigated using the permissions: {} key. Only the official GitHub checkout action is kept. Remove cargo-fmt binaries that may already be installed, which makes `rustup update` print warnings. Signed-off-by: Björn Roy Baron <[email protected]> Co-authored-by: Mickaël Salaün <[email protected]> Signed-off-by: Mickaël Salaün <[email protected]>
landlock-lsm · Jan 26, 2023 · f69888f · f69888f
1 parent 99628b1
commit f69888f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 53 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -21,16 +21,13 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
+      run: |
+        rm ~/.cargo/bin/{cargo-fmt,rustfmt} || :
+        rustup default stable
+        rustup update
 
     - name: Build documentation
-      uses: actions-rs/cargo@v1
-      with:
-        command: doc
-        args: --no-deps
+      run: rustup run stable cargo doc --no-deps
 
     - name: Add index
       run: |

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -24,16 +24,13 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
+      run: |
+        rm ~/.cargo/bin/{cargo-fmt,rustfmt} || :
+        rustup default stable
+        rustup update
 
     - name: Run tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --verbose
+      run: rustup run stable cargo test --verbose
 
   ubuntu_20_rust_stable:
     runs-on: ubuntu-20.04
@@ -43,47 +40,29 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
-        components: rustfmt, clippy
+      run: |
+        rm ~/.cargo/bin/{cargo-fmt,rustfmt} || :
+        rustup default stable
+        rustup component add rustfmt clippy
+        rustup update
 
     - name: Build
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: --verbose
+      run: rustup run stable cargo build --verbose
 
     - name: Run tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --verbose
+      run: rustup run stable cargo test --verbose
 
     - name: Check format
-      uses: actions-rs/cargo@v1
-      with:
-        command: fmt
-        args: --all -- --check
+      run: rustup run stable cargo fmt --all -- --check
 
     - name: Check source with Clippy
-      uses: actions-rs/cargo@v1
-      with:
-        command: clippy
-        args: -- --deny warnings
+      run: rustup run stable cargo clippy -- --deny warnings
 
     - name: Check tests with Clippy
-      uses: actions-rs/cargo@v1
-      with:
-        command: clippy
-        args: --tests -- --deny warnings
+      run: rustup run stable cargo clippy --tests -- --deny warnings
 
     - name: Check documentation
-      uses: actions-rs/cargo@v1
-      with:
-        command: doc
-        args: --no-deps
+      run: rustup run stable cargo doc --no-deps
 
   ubuntu_22_rust_stable:
     runs-on: ubuntu-22.04
@@ -93,13 +72,10 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install Rust stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
+      run: |
+        rm ~/.cargo/bin/{cargo-fmt,rustfmt} || :
+        rustup default stable
+        rustup update
 
     - name: Run tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --verbose
+      run: rustup run stable cargo test --verbose