diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2023-04-20 22:05:49 +0000 |
|---|---|---|
| committer | Sven-Hendrik Haase <svenstaro@gmail.com> | 2023-04-20 22:06:09 +0000 |
| commit | 8a1f602a1d90c5b4a0d57dae74cd3c7541fb97ec (patch) | |
| tree | d86ade2785dd3c3407c9cef4e43252a9875a22d6 /.github | |
| parent | Switch from deprecated get_if_addrs to if-addrs (diff) | |
| download | miniserve-8a1f602a1d90c5b4a0d57dae74cd3c7541fb97ec.tar.gz miniserve-8a1f602a1d90c5b4a0d57dae74cd3c7541fb97ec.zip | |
Switch to dtolnay/rust-toolchain
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-release.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 25 |
2 files changed, 12 insertions, 30 deletions
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ceb0aed..b1b7014 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -92,21 +92,18 @@ jobs: uses: actions/checkout@v2 - name: Setup Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - override: true + uses: dtolnay/rust-toolchain@stable - run: sudo apt install musl-tools if: startsWith(matrix.os, 'ubuntu') - name: cargo build - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --locked --target=${{ matrix.target }} ${{ matrix.cargo_flags }} - use-cross: ${{ matrix.cross }} + run: cargo build --release --locked --target=${{ matrix.target }} ${{ matrix.cargo_flags }} + if: ${{ matrix.cross }} == false + + - name: cross build + run: cross build --release --locked --target=${{ matrix.target }} ${{ matrix.cargo_flags }} + if: ${{ matrix.cross }} == true - name: Set exe extension for Windows run: echo "EXE=.exe" >> $env:GITHUB_ENV diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 840f43a..f58b214 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,31 +15,16 @@ jobs: uses: actions/checkout@v2 - name: Setup Rust toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - components: rustfmt, clippy + uses: dtolnay/rust-toolchain@stable - name: cargo build - uses: actions-rs/cargo@v1 - with: - command: build + run: cargo build - name: cargo test - uses: actions-rs/cargo@v1 - with: - command: test + run: cargo test - name: cargo fmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all -- --check - name: cargo clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: -- -D warnings + run: cargo clippy -- -D warnings |