Skip to content

Commit

Permalink
Don't explicitly define rust toolchain input when using stable/nightl…
Browse files Browse the repository at this point in the history
…y revs
  • Loading branch information
Eligioo committed May 3, 2024
1 parent ba0179f commit 1adb4ac
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 19 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/build+test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly
components: rustfmt
- run: cargo fmt --all -- --check

Expand All @@ -36,7 +35,6 @@ jobs:
run: "! grep -rEoh --exclude-dir tests --exclude-dir target 'TYPE_ID: u16 = [^;]+;' | sort | uniq -d | grep '^'"
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: llvm-tools-preview
- uses: Swatinem/rust-cache@v2
- name: Install Protoc
Expand Down Expand Up @@ -77,7 +75,6 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: clippy
- uses: Swatinem/rust-cache@v2
- name: Install Protoc
Expand Down Expand Up @@ -108,8 +105,6 @@ jobs:
swap-storage: true
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: Swatinem/rust-cache@v2
- name: Install Protoc
run: sudo apt-get install protobuf-compiler
Expand All @@ -134,8 +129,6 @@ jobs:
run: pip install scripts/devnet
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: Swatinem/rust-cache@v2
- name: Install Protoc
run: sudo apt-get install protobuf-compiler
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build_crate_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: Swatinem/rust-cache@v2
- name: Install Protoc
run: sudo apt-get install protobuf-compiler
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/code_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: llvm-tools-preview
- uses: taiki-e/install-action@cargo-llvm-cov
- uses: taiki-e/install-action@nextest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/devnet_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ jobs:
run: pip install scripts/devnet
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: Swatinem/rust-cache@v2
- name: Optionally patch the source
run: ${{ matrix.pre }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/devnet_scenarios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ jobs:
run: pip install scripts/devnet
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: Swatinem/rust-cache@v2
- name: Optionally patch the source
run: ${{ matrix.pre }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/expensive_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: llvm-tools-preview
- uses: Swatinem/rust-cache@v2
- name: Install cargo-nextest
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/github_release_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ jobs:
- name: Install protoc
run: |
sudo apt-get update && sudo apt-get install -y protobuf-compiler
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- uses: dtolnay/rust-toolchain@stable
- uses: actions-rs/cargo@v1
with:
command: build
Expand Down

0 comments on commit 1adb4ac

Please sign in to comment.