Skip to content

Revert the version of Rust fixed #2155

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.

Sign up for GitHub

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

Merged
bors merged 2 commits into from
Jan 18, 2022
Merged

Revert the version of Rust fixed #2155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a80485
Revert #2141 because the bug on the nightly compiler has been fixed …
AurelienFT Jan 15, 2022
a0e948e
Merge branch 'main' into revert_rust_version_fixed
AurelienFT Jan 17, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
target: "x86_64-unknown-linux-musl"
override: true
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
target: "x86_64-pc-windows-gnu"
override: true
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- run: |
export HOME=/root
rustup update
rustup default nightly-2021-12-03
rustup default nightly
rustup target add x86_64-apple-darwin
cargo update
rm -rf massa/*
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-light.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
components: rustfmt
override: true
- uses: Swatinem/rust-cache@v1
Expand All @@ -41,7 +41,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
Expand All @@ -60,7 +60,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
components: clippy
override: true
- uses: Swatinem/rust-cache@v1
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
components: rustfmt
override: true
- uses: Swatinem/rust-cache@v1
Expand All @@ -41,7 +41,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
Expand All @@ -59,7 +59,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
Expand All @@ -78,7 +78,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
Expand All @@ -98,7 +98,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
components: clippy
override: true
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
Expand All @@ -151,7 +151,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
override: true
- uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2021-12-03
toolchain: nightly
components: rustfmt
override: true
- uses: actions-rs/cargo@v1
Expand Down