Skip to content

Commit b9c246c

Browse files
bors[bot]japaric
andcommitted
Merge #152
152: switch ci to stable and recommend using the stable channel r=therealprof a=japaric Co-authored-by: Jorge Aparicio <[email protected]>
2 parents 8a48ee5 + 9939a2b commit b9c246c

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
language: rust
2-
rust: beta
32

43
install:
54
- bash ci/install.sh

src/03-setup/README.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ several MBs in size.
3030
We'll use all the tools listed below. Where a minimum version is not specified, any recent version
3131
should work but we have listed the version we have tested.
3232

33-
- Rust 1.30, 1.30-beta, nightly-2018-09-13, or a newer toolchain.
33+
- Rust 1.31 or a newer toolchain.
3434

3535
- [`itmdump`] v0.2.1
3636

@@ -67,18 +67,13 @@ Next, follow OS-agnostic installation instructions for a few of the tools:
6767

6868
Install rustup by following the instructions at [https://rustup.rs](https://rustup.rs).
6969

70-
Then, install or switch to the beta channel.
71-
72-
``` console
73-
$ rustup default beta
74-
```
75-
76-
**NOTE** Make sure you have a toolchain newer than `1.30-beta.1`. `rustc -V`
77-
should return a date newer than the one shown below:
70+
If you already have rustup installed double check that you are on the stable
71+
channel and your stable toolchain is up to date. `rustc -V` should return a date
72+
newer than the one shown below:
7873

7974
``` console
8075
$ rustc -V
81-
rustc 1.30.0-beta.1 (14f51b05d 2018-09-18)
76+
rustc 1.31.0 (abe02cefd 2018-12-04)
8277
```
8378

8479
### `itmdump`

0 commit comments

Comments
 (0)