diff options
| author | Tim Oram <dev@mitmaro.ca> | 2022-11-24 09:34:40 -0330 |
|---|---|---|
| committer | Tim Oram <dev@mitmaro.ca> | 2022-11-24 21:33:26 -0330 |
| commit | c391c1c6ba65d528814d0bb133a5f6abb616cae7 (patch) | |
| tree | f61ce4482e7ad051ef4532055fd782d8ccc4539d | |
| parent | 75cdfffdd59715661e564470c133831a4e19253f (diff) | |
Pin nightly rust version to address regression
| -rw-r--r-- | .github/workflows/pull-request.yml | 7 | ||||
| -rw-r--r-- | Makefile.toml | 19 |
2 files changed, 16 insertions, 10 deletions
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 1bbdcfb..f57563c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -49,8 +49,9 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly + - uses: dtolnay/rust-toolchain@master with: + toolchain: nightly-2022-11-21 components: rustfmt - uses: Swatinem/rust-cache@v2 - uses: baptiste0928/cargo-install@v1 @@ -62,7 +63,9 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@nightly + - uses: dtolnay/rust-toolchain@master + with: + toolchain: nightly-2022-11-21 - uses: Swatinem/rust-cache@v2 - name: Run cargo-tarpaulin uses: actions-rs/tarpaulin@v0.1 diff --git a/Makefile.toml b/Makefile.toml index 1ab879a..cc4dd8a 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1,3 +1,6 @@ +[env] +RUST_NIGHTLY_VERSION_PREFIX = "-2022-11-21" + [config] skip_core_tasks = true default_to_workspace = false @@ -21,7 +24,7 @@ args = ["build", "${@}"] [tasks.build-nightly] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" install_crate = false command = "cargo" args = ["build", "${@}"] @@ -48,7 +51,7 @@ args = ["clean"] [tasks.coverage] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" command = "cargo" condition = { platforms = ["linux"] } env = { "RUSTFLAGS" = "-C link-dead-code" } @@ -85,7 +88,7 @@ args = [ [tasks.docs-nightly] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" ignore_errors = true command = "cargo" args = [ @@ -115,7 +118,7 @@ args = [ [tasks.lint-nightly] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" ignore_errors = true command = "cargo" args = [ @@ -128,7 +131,7 @@ args = [ [tasks.format] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" command = "cargo" args = [ "fmt", @@ -140,7 +143,7 @@ args = [ [tasks.format-apply] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" command = "cargo" args = [ "fmt", @@ -152,7 +155,7 @@ args = [ [tasks.licenses] dependencies = ["update-rust-nightly"] -toolchain = "nightly" +toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}" script = [''' cargo +nightly about generate "docs/licenses.hbs" > "docs/licenses.html" '''] @@ -176,4 +179,4 @@ args = ["update", "stable"] [tasks.update-rust-nightly] command = "rustup" -args = ["update", "nightly"] +args = ["update", "nightly${RUST_NIGHTLY_VERSION_PREFIX}"] |