wip: fix

ralexstokes · Jan 17, 2023 · 881a551 · 881a551
1 parent 9e5bcf6
commit 881a551
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,43 +6,38 @@ on:
   pull_request:
     branches: [ main ]
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
 
+      - name: Read toolchain file
+        id: rust-toolchain
+        run: |
+          RUST_TOOLCHAIN=$(grep 'channel' rust-toolchain.toml | awk '{split($0,a," = "); print a[2]}' | tr -d '"')
+          echo "RUST_TOOLCHAIN=$RUST_TOOLCHAIN" >> $GITHUB_OUTPUT
+        shell: bash
+
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
+          toolchain: ${{ steps.rust-toolchain.outputs.RUST_TOOLCHAIN }}
 
       - name: Rust cache
         uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
 
       - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --all-targets --all-features --verbose
+        run: cargo build --all-targets --all-features --verbose
 
       - name: Run tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --verbose
+        run: cargo test --verbose
 
       - name: Validate config
-        uses: actions-rs/cargo@v1
-        with:
-          command: run
-          args: config example.config.toml
+        run: cargo run config example.config.toml
 
   lint:
     runs-on: ubuntu-latest
@@ -51,25 +46,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly
-          profile: minimal
           components: rustfmt, clippy
-          override: true
 
       - name: Rust cache
         uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
 
       - name: Check format
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all --check
+        run: cargo +nightly fmt --all --check
 
-      - uses: actions-rs/clippy-check@v1
-        with:
-          args: --all-targets --all-features --verbose -- -D warnings
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check clippy
+        run: cargo +nightly clippy --all-targets --all-features --verbose -- -D warnings
diff --git a/justfile b/justfile
@@ -15,7 +15,7 @@ test:
 fmt:
     cargo +nightly fmt --all
 lint: fmt validate-example-config
-    cargo clippy --all-targets --all-features
+    cargo +nightly clippy --all-targets --all-features
 build:
     cargo build --all-targets --all-features
 run-ci: lint build test