diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2020-06-17 22:53:24 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2020-06-17 23:36:51 -0400 |
| commit | 3985e4c1fe16f2096d4682b3faf8a156924afddb (patch) | |
| tree | 7498435d71c4fadbd3714b45e065be8cebc8a540 | |
| parent | 4c765547fb6ff0697d11d0162c0bd3d7f5655ce5 (diff) | |
Restore rust-toolchain file.
Removing this file broke Heroku deployments. The emk/rust buildpack
relies on this file to detect the Rust version, and as this code
_requires_ a nightly, the default stable version fails to deploy.
Unfortunately, this effectively leaves the project pinned to a specific
nightly version until and unless one of a few things happens:
* We remove the test step that verifies formatting,
* Travis adds a non-minimal Rust profile,
* We migrate CI to a service that supports a more complete Rust profile,
or
* Nightly has rustfmt again.
See <https://github.com/emk/heroku-buildpack-rust#specifying-which-version-of-rust-to-use>.
This reverts commit f43bcb502435ccd99e163671204371dd8b62024f.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | rust-toolchain | 1 |
4 files changed, 2 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 3980786..1b8bcad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,8 @@ language: rust # 2020-06-17 - nightly hasn't had rustfmt since 2020-06-10, so builds fail on # that toolchain. We want to use it as far as is possible, though. rust: - - nightly - nightly-2020-06-10 -jobs: - allow_failures: - - rust: nightly - cache: cargo install: @@ -1358,7 +1358,7 @@ dependencies = [ [[package]] name = "things-to-check" -version = "0.1.0" +version = "0.1.0+evergreen" dependencies = [ "actix-rt", "actix-web", @@ -13,12 +13,6 @@ I thought this was such a good idea, I turned it into a web bot. Want to work on this code, or run it yourself? Install the following: * [An installed copy of the Rust toolchain](https://rustup.rs). -* The `nightly` toolchain: - - ```bash - rustup toolchain add nightly - rustup override set nightly - ``` Building, testing, &c follow Rust norms: use [Cargo](https://doc.rust-lang.org/cargo/guide/working-on-an-existing-project.html) diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..4aec5c6 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +nightly-2020-06-10 |