From e122ff2c05f52a9b4643635adc651e9da5ec4e18 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 5 Jan 2023 14:10:24 +0700 Subject: [PATCH] Remove other action-rs --- .github/workflows/build.yml | 22 +++++++++------------- .github/workflows/style_checks.yml | 28 +++++++++------------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8d66fe..c17d525 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,12 +111,11 @@ jobs: libgtk2.0-dev:${{ matrix.arch }} \ libglib2.0-dev:${{ matrix.arch }} - name: Install ${{ matrix.arch }} Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: ${{ matrix.target }} - profile: minimal + run: | + rustup install stable-${TARGET} + rustup override set stable-${TARGET} + env: + TARGET: ${{ matrix.target }} - name: Build run: | cargo build --release --all-features --target=${TARGET} @@ -141,14 +140,11 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - name: Install latest rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + run: | + rustup toolchain install stable - name: Install toml-cli - uses: actions-rs/install@v0.1 - with: - crate: toml-cli - version: latest + run: | + cargo install toml-cli - name: Get project version id: toml run: | diff --git a/.github/workflows/style_checks.yml b/.github/workflows/style_checks.yml index 09b3931..e3d797c 100644 --- a/.github/workflows/style_checks.yml +++ b/.github/workflows/style_checks.yml @@ -13,20 +13,11 @@ jobs: sudo apt update sudo apt install -y aptitude sudo aptitude install -y libgstrtspserver-1.0-dev libgstreamer1.0-dev libgtk2.0-dev - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - components: clippy - override: true - - name: Run clippy action to produce annotations - uses: actions-rs/clippy-check@v1 - if: steps.check_permissions.outputs.has-permission - with: - toolchain: nightly - token: ${{ secrets.GITHUB_TOKEN }} - args: --workspace --all-targets --all-features - - name: Run clippy manually without annotations - if: ${{ !steps.check_permissions.outputs.has-permission }} + - name: Install nightly rust + run: | + rustup toolchain install nightly --component cargo + rustup override set nightly + - name: Run clippy manually run: cargo +nightly clippy --workspace --all-targets --all-features check_fmt: @@ -34,11 +25,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - components: rustfmt - override: true + - name: Install nightly rust + run: | + rustup toolchain install nightly --component rustfmt + rustup override set nightly - name: rustfmt run: | cargo +nightly fmt --all -- --check