Use rustup-show instead of actions-rs

This commit is contained in:
Charlie Marsh 2023-01-10 07:43:33 -05:00
parent 91620c378a
commit 6c6fe4adda
6 changed files with 18 additions and 70 deletions

View File

@ -21,11 +21,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - run: rustup show
with:
profile: minimal
toolchain: nightly-2022-11-01
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- run: cargo build --all - run: cargo build --all
- run: ./target/debug/ruff_dev generate-all - run: ./target/debug/ruff_dev generate-all
@ -38,12 +34,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - run: rustup show
with:
profile: minimal
toolchain: nightly-2022-11-01
override: true
components: rustfmt
- run: cargo fmt --all --check - run: cargo fmt --all --check
cargo_clippy: cargo_clippy:
@ -51,13 +42,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - run: rustup show
with:
profile: minimal
toolchain: nightly-2022-11-01
override: true
components: clippy
target: wasm32-unknown-unknown
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
- run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
@ -67,11 +52,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - run: rustup show
with:
profile: minimal
toolchain: nightly-2022-11-01
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- run: cargo install cargo-insta - run: cargo install cargo-insta
- run: pip install black[d]==22.12.0 - run: pip install black[d]==22.12.0
@ -90,11 +71,7 @@ jobs:
# WASM_BINDGEN_TEST_TIMEOUT: 60 # WASM_BINDGEN_TEST_TIMEOUT: 60
# steps: # steps:
# - uses: actions/checkout@v3 # - uses: actions/checkout@v3
# - uses: actions-rs/toolchain@v1 # - run: rustup show
# with:
# profile: minimal
# toolchain: nightly-2022-11-01
# override: true
# - uses: actions/cache@v3 # - uses: actions/cache@v3
# env: # env:
# cache-name: cache-cargo # cache-name: cache-cargo
@ -116,11 +93,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - run: rustup show
with:
profile: minimal
toolchain: nightly-2022-11-01
override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:

View File

@ -24,11 +24,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
architecture: x64 architecture: x64
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 run: rustup show
with:
toolchain: stable
profile: minimal
default: true
- name: Build wheels - x86_64 - name: Build wheels - x86_64
uses: messense/maturin-action@v1 uses: messense/maturin-action@v1
with: with:
@ -51,11 +47,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
architecture: x64 architecture: x64
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 run: rustup show
with:
toolchain: stable
profile: minimal
default: true
- name: Build wheels - universal2 - name: Build wheels - universal2
uses: messense/maturin-action@v1 uses: messense/maturin-action@v1
with: with:
@ -81,11 +73,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
architecture: ${{ matrix.target }} architecture: ${{ matrix.target }}
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 run: rustup show
with:
toolchain: stable
profile: minimal
default: true
- name: Build wheels - name: Build wheels
uses: messense/maturin-action@v1 uses: messense/maturin-action@v1
with: with:

View File

@ -17,12 +17,7 @@ jobs:
CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }} CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - run: rustup show
with:
profile: minimal
toolchain: nightly-2022-11-01
override: true
target: wasm32-unknown-unknown
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 18 node-version: 18

View File

@ -25,11 +25,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
architecture: x64 architecture: x64
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 run: rustup show
with:
toolchain: stable
profile: minimal
default: true
- name: Build wheels - x86_64 - name: Build wheels - x86_64
uses: messense/maturin-action@v1 uses: messense/maturin-action@v1
with: with:
@ -52,11 +48,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
architecture: x64 architecture: x64
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 run: rustup show
with:
toolchain: stable
profile: minimal
default: true
- name: Build wheels - universal2 - name: Build wheels - universal2
uses: messense/maturin-action@v1 uses: messense/maturin-action@v1
with: with:
@ -82,11 +74,7 @@ jobs:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
architecture: ${{ matrix.target }} architecture: ${{ matrix.target }}
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 run: rustup show
with:
toolchain: stable
profile: minimal
default: true
- name: Build wheels - name: Build wheels
uses: messense/maturin-action@v1 uses: messense/maturin-action@v1
with: with:

View File

@ -1 +0,0 @@
1.65.0

5
rust-toolchain.toml Normal file
View File

@ -0,0 +1,5 @@
[toolchain]
# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
# https://rust-lang.github.io/rustup/concepts/profiles.html
profile = "default"
channel = "1.65.0"