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.

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

Jump to bottom

Update rust-toolchain and install rustfmt on CI #290

Merged
merged 4 commits into from
Aug 16, 2020
Merged

Update rust-toolchain and install rustfmt on CI #290

merged 4 commits into from
Aug 16, 2020

Conversation

JohnTitor
Copy link
Member

@JohnTitor JohnTitor commented Aug 13, 2020 •
edited
Loading

  • Install rustfmt explicitly on CI
    • Fix format as well
  • Skip using Heroku CLI on the PRs as the secret tokens aren't exposed here
  • Update the rust-toolchain version and dependencies

@JohnTitor JohnTitor changed the title Install rustfmt to fix CI Tweak CI config to fix CI Aug 13, 2020
@JohnTitor
Use new lockfile format
d7f49d4
@JohnTitor
Update dependencies
dcb902f 
```
Adding addr2line v0.13.0
Adding adler v0.2.3
Removing adler32 v1.0.4
Adding aead v0.2.0
Adding aes v0.3.2
Adding aes-gcm v0.5.0
Adding aes-soft v0.3.3
Adding aesni v0.6.0
Updating aho-corasick v0.7.6 -> v0.7.13
Removing arrayvec v0.4.12
Updating atty v0.2.13 -> v0.2.14
Removing autocfg v0.1.6
Adding autocfg v0.1.7
Adding autocfg v1.0.0
Updating backtrace v0.3.38 -> v0.3.50
Removing backtrace-sys v0.1.31
Adding base64 v0.12.3
Adding block-cipher-trait v0.6.2
Updating block-padding v0.1.4 -> v0.1.5
Updating byteorder v1.3.2 -> v1.3.4
Removing c2-chacha v0.2.2
Updating cc v1.0.45 -> v1.0.58
Updating chrono v0.4.9 -> v0.4.13
Adding cloudabi v0.1.0
Updating cookie v0.11.1 -> v0.11.3
Updating core-foundation v0.6.4 -> v0.7.0
Updating core-foundation-sys v0.6.2 -> v0.7.0
Updating crossbeam-deque v0.7.1 -> v0.7.3
Updating crossbeam-epoch v0.7.2 -> v0.8.2
Updating crossbeam-queue v0.1.2 -> v0.2.3
Updating crossbeam-utils v0.6.6 -> v0.7.2
Adding crypto-mac v0.7.0
Updating diesel v1.4.3 -> v1.4.5
Updating dtoa v0.4.4 -> v0.4.6
Updating either v1.5.3 -> v1.6.0
Updating encoding_rs v0.8.20 -> v0.8.23
Updating env_logger v0.7.0 -> v0.7.1
Updating error-chain v0.12.1 -> v0.12.4
Updating failure v0.1.6 -> v0.1.8
Updating failure_derive v0.1.6 -> v0.1.8
Updating filetime v0.2.7 -> v0.2.12
Updating flate2 v1.0.12 -> v1.0.16
Updating fnv v1.0.6 -> v1.0.7
Updating getrandom v0.1.12 -> v0.1.14
Adding ghash v0.2.3
Adding gimli v0.22.0
Adding hashbrown v0.8.2
Adding hermit-abi v0.1.15
Updating hex v0.4.0 -> v0.4.2
Adding hkdf v0.8.0
Adding hmac v0.7.1
Updating http v0.1.19 -> v0.1.21
Updating indexmap v1.2.0 -> v1.5.1
Updating inotify v0.6.1 -> v0.7.1
Adding instant v0.1.6
Updating itertools v0.8.0 -> v0.8.2
Updating itoa v0.4.4 -> v0.4.6
Updating lazycell v1.2.1 -> v1.3.0
Updating libc v0.2.64 -> v0.2.74
Removing lock_api v0.2.0
Removing lock_api v0.3.1
Adding lock_api v0.3.4
Adding lock_api v0.4.1
Updating log v0.4.8 -> v0.4.11
Adding maybe-uninit v2.0.0
Updating memchr v2.2.1 -> v2.3.3
Updating memoffset v0.5.1 -> v0.5.5
Updating mime v0.3.14 -> v0.3.16
Removing mime_guess v1.8.7
Removing mime_guess v2.0.1
Adding mime_guess v1.8.8
Adding mime_guess v2.0.3
Updating miniz_oxide v0.3.3 -> v0.4.0
Updating mio v0.6.19 -> v0.6.22
Updating mio-extras v2.0.5 -> v2.0.6
Updating native-tls v0.2.3 -> v0.2.4
Updating net2 v0.2.33 -> v0.2.34
Removing nodrop v0.1.14
Updating notify v4.0.13 -> v4.0.15
Updating num-integer v0.1.41 -> v0.1.43
Updating num-traits v0.2.8 -> v0.2.12
Updating num_cpus v1.10.1 -> v1.13.0
Adding object v0.20.0
Updating openssl v0.10.25 -> v0.10.30
Updating openssl-sys v0.9.51 -> v0.9.58
Updating parking_lot v0.8.0 -> v0.11.0
Updating parking_lot_core v0.5.0 -> v0.8.0
Updating pear v0.1.2 -> v0.1.4
Updating pear_codegen v0.1.2 -> v0.1.4
Updating pest v2.1.2 -> v2.1.3
Updating pest_generator v2.1.1 -> v2.1.3
Updating pest_meta v2.1.2 -> v2.1.3
Updating pkg-config v0.3.16 -> v0.3.18
Adding polyval v0.3.3
Updating ppv-lite86 v0.2.5 -> v0.2.8
Updating proc-macro2 v1.0.5 -> v1.0.19
Updating publicsuffix v1.5.3 -> v1.5.4
Updating quick-error v1.2.2 -> v1.2.3
Updating quote v1.0.2 -> v1.0.7
Updating r2d2 v0.8.5 -> v0.8.9
Updating rand v0.7.2 -> v0.7.3
Updating rand_chacha v0.2.1 -> v0.2.2
Updating redox_syscall v0.1.56 -> v0.1.57
Updating regex v1.3.1 -> v1.3.9
Updating regex-syntax v0.6.12 -> v0.6.18
Updating remove_dir_all v0.5.2 -> v0.5.3
Updating reqwest v0.9.22 -> v0.9.24
Removing ring v0.13.5
Updating rocket v0.4.2 -> v0.4.5
Updating rocket_codegen v0.4.2 -> v0.4.5
Updating rocket_contrib v0.4.2 -> v0.4.5
Updating rocket_http v0.4.2 -> v0.4.5
Updating ryu v1.0.2 -> v1.0.5
Updating safemem v0.3.2 -> v0.3.3
Updating same-file v1.0.5 -> v1.0.6
Updating schannel v0.1.16 -> v0.1.19
Updating scheduled-thread-pool v0.2.2 -> v0.2.5
Updating scopeguard v1.0.0 -> v1.1.0
Updating security-framework v0.3.1 -> v0.4.4
Updating security-framework-sys v0.3.1 -> v0.4.3
Updating serde v1.0.101 -> v1.0.115
Updating serde_derive v1.0.101 -> v1.0.115
Updating serde_json v1.0.41 -> v1.0.57
Updating sha-1 v0.8.1 -> v0.8.2
Adding sha2 v0.8.2
Removing smallvec v0.6.10
Adding smallvec v0.6.13
Adding smallvec v1.4.2
Adding subtle v1.0.0
Adding subtle v2.2.3
Updating syn v1.0.5 -> v1.0.38
Updating synstructure v0.12.1 -> v0.12.4
Updating termcolor v1.0.5 -> v1.1.0
Updating thread_local v0.3.6 -> v1.0.1
Updating time v0.1.42 -> v0.1.43
Adding tinyvec v0.3.3
Updating tokio-current-thread v0.1.6 -> v0.1.7
Updating tokio-executor v0.1.8 -> v0.1.10
Updating tokio-io v0.1.12 -> v0.1.13
Updating tokio-reactor v0.1.10 -> v0.1.12
Updating tokio-sync v0.1.7 -> v0.1.8
Updating tokio-tcp v0.1.3 -> v0.1.4
Updating tokio-threadpool v0.1.16 -> v0.1.18
Updating tokio-timer v0.2.11 -> v0.2.13
Updating toml v0.5.3 -> v0.5.6
Updating try-lock v0.2.2 -> v0.2.3
Updating typenum v1.11.2 -> v1.12.0
Updating ucd-trie v0.1.2 -> v0.1.3
Updating unicase v2.5.1 -> v2.6.0
Updating unicode-normalization v0.1.8 -> v0.1.13
Updating unicode-xid v0.2.0 -> v0.2.1
Adding universal-hash v0.3.0
Removing untrusted v0.6.2
Updating url v2.1.0 -> v2.1.1
Updating vcpkg v0.2.7 -> v0.2.10
Updating version_check v0.9.1 -> v0.9.2
Updating walkdir v2.2.9 -> v2.3.1
Updating wasi v0.7.0 -> v0.9.0+wasi-snapshot-preview1
Updating winapi v0.3.8 -> v0.3.9
Updating winapi-util v0.1.2 -> v0.1.5
Removing wincolor v1.0.2
Removing yansi v0.4.0
Adding zeroize v1.1.0
```
@JohnTitor JohnTitor changed the title Tweak CI config to fix CI Tweak CI config to fix it Aug 13, 2020
@JohnTitor JohnTitor changed the title Tweak CI config to fix it Update rust-toolchain and install rustfmt on CI Aug 13, 2020
@JohnTitor JohnTitor mentioned this pull request Aug 13, 2020
Merged
@spastorino
Copy link
Member

Hey @JohnTitor, I'm not sure who has merge rights in this repo but I was thinking if it doesn't worth to split this PR into two different ones. Leaving this one as one that solves the CI issues with the very minimum changes (for easier approval) and then another one to update crates and such. What do you think?.

cc @anp

@JohnTitor
Copy link
Member Author

JohnTitor commented Aug 15, 2020 •
edited
Loading

@spastorino Well, I don't think they make the reviews hard. Indeed, the essential part of this is 11915c7 and 3d1d72d, but the current used nightly and deps are quite old and the deps cause the compilation failure with the recent nightly. At least, the tests pass and it doesn't have any major changes AFAIK so we could say it safe, I presume.
But reviewers think it should be separated, I'm happy to do so :)

@spastorino
Copy link
Member

@JohnTitor yeah I'm not saying is hard to review or anything like that but what happens often is that people may not want to upgrade or something like that so different things handled in different PRs make things move faster. Anyway, whatever you prefer, all I want is to have #289 as soon as possible because not having that makes the prioritization wg process a bit more painful.

@anp
Copy link
Member

anp commented Aug 16, 2020

Sorry for the delay here. Agree that the crate version roll is large but rfcbot has typically needed to roll crates along with its nightly because of rocket. I think we can resolve that soon though: #291. If something breaks our process in the past has been to revert and come in again.

@anp anp merged commit e52cadc into rust-lang:master Aug 16, 2020
@JohnTitor JohnTitor deleted the fix-ci branch August 16, 2020 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JohnTitor @spastorino @anp