Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Fix rust toolchain not fixed correctly #3882

Merged
merged 6 commits into from
Jan 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/actions/build_debug/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ runs:
version: '3.x'
repo-token: ${{ inputs.github_token }}

- uses: actions-rs/toolchain@v1
with:
target: ${{ matrix.config.target }}
toolchain: nightly
override: true
components: rustfmt, clippy
- name: Add rust target
shell: bash
run: rustup target add ${{ matrix.config.target }}

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
9 changes: 3 additions & 6 deletions .github/actions/build_release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ runs:
version: '3.x'
repo-token: ${{ inputs.github_token }}

- uses: actions-rs/toolchain@v1
with:
target: ${{ matrix.config.target }}
toolchain: nightly
override: true
components: rustfmt, clippy
- name: Add rust target
shell: bash
run: rustup target add ${{ matrix.config.target }}

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
6 changes: 0 additions & 6 deletions .github/actions/check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ runs:
version: '3.x'
repo-token: ${{ inputs.github_token }}

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
components: rustfmt, clippy

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
with:
Expand Down
8 changes: 3 additions & 5 deletions .github/actions/test_proxy_mode/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ runs:
- name: Maximize build space
uses: ./.github/actions/cleanup

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
target: ${{ matrix.config.target }}
override: true
- name: Add rust target
shell: bash
run: rustup target add ${{ matrix.config.target }}

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
8 changes: 3 additions & 5 deletions .github/actions/test_stateful_standalone/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ runs:
- name: Maximize build space
uses: ./.github/actions/cleanup

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
target: ${{ matrix.config.target }}
- name: Add rust target
shell: bash
run: rustup target add ${{ matrix.config.target }}

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
8 changes: 3 additions & 5 deletions .github/actions/test_stateless_cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ runs:
- name: Maximize build space
uses: ./.github/actions/cleanup

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
target: ${{ matrix.config.target }}
- name: Add rust target
shell: bash
run: rustup target add ${{ matrix.config.target }}

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
8 changes: 3 additions & 5 deletions .github/actions/test_stateless_standalone/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ runs:
- name: Maximize build space
uses: ./.github/actions/cleanup

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
target: ${{ matrix.config.target }}
override: true
- name: Add rust target
shell: bash
run: rustup target add ${{ matrix.config.target }}

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
7 changes: 0 additions & 7 deletions .github/actions/test_unit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ runs:
version: '3.x'
repo-token: ${{ inputs.github_token }}

- uses: actions-rs/toolchain@v1
with:
target: ${{ matrix.config.target }}
toolchain: nightly
override: true
components: rustfmt, clippy

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
with:
Expand Down