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.

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

chore: update dependencies #12261

Merged
merged 1 commit into from
Jun 13, 2023
Merged

chore: update dependencies #12261

merged 1 commit into from
Jun 13, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Jun 13, 2023

Hand-picked some dependencies to update. Looks pretty safe?

  • anyhow 1.0.70 -> 1.0.71
  • base64 0.21.0 -> 0.21.2
  • clap@4.2.1 4.2.1 -> 4.3.3
  • flate2 1.0.25 -> 1.0.26
  • git2 0.17.1 -> 0.17.2
  • libgit2-sys 0.15.1+1.6.4 -> 0.15.2+1.6.4
  • log 0.4.17 -> 0.4.19
  • openssl 111.25.3+1.1.1t -> 111.26.0+1.1.1u
  • pkg-config 0.3.26 -> 0.3.27
  • proptest 1.1.0 -> 1.2.0
  • pulldown-cmark 0.9.2 -> 0.9.3
  • serde 1.0.160 -> 1.0.164
  • serde_json 1.0.95 -> 1.0.96
  • snapbox 0.4.10 -> 0.4.11
  • tempfile 3.5.0 -> 3.6.0
  • time 0.3.20 -> 0.3.22
  • toml 0.7.3 -> 0.7.4
  • toml_edit 0.19.8 -> 0.19.10
  • url 2.3.4 -> 2.4.0

Additional information

This is a bit painful, shall we introduce some bot (dependant/renovate) to help this process.

In addition, we should have a job of cargo update && cargo test in our CI pipeline.

Hand-picked some dependencies to update. Looks pretty safe?

- anyhow
- base64
- clap@4.2.1
- flate2
- git2
- libgit2-sys
- log
- openssl
- pkg-config
- proptest
- pulldown-cmark
- serde
- serde_json
- snapbox
- tempfile
- time
- toml
- toml_edit
- url
@rustbot
Copy link
Collaborator

rustbot commented Jun 13, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 13, 2023
@ehuss
Copy link
Contributor

ehuss commented Jun 13, 2023

Thanks!

@bors r+

This is a bit painful, shall we introduce some bot (dependant/renovate) to help this process.

In the past we did a blanket update just after a release to maximize the time for testing and exposure. We could add cargo update as part of the version bump process?

Otherwise, if we use a bot, I would prefer to configure it to minimize the number of updates it does. I find that they generate a lot of noise otherwise. I'd also like to avoid doing unnecessary updates just before a beta branch. My impression is that renovate is more configurable and generally better, but I don't have much experience with either.

In addition, we should have a job of cargo update && cargo test in our CI pipeline.

Part of the motivation for using a lock file is to avoid breaking CI for PRs due to issues with updates. If we do something like this, I would recommend using a scheduled workflow instead. One problem with scheduled workflows is sending notifications. I think that can be fixed by using gh to post a new issue if the job fails, which probably shouldn't be too difficult, but I haven't tried that, yet.

@bors
Copy link
Collaborator

bors commented Jun 13, 2023

📌 Commit bf06fc8 has been approved by ehuss

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 13, 2023
@bors
Copy link
Collaborator

bors commented Jun 13, 2023

⌛ Testing commit bf06fc8 with merge 0d5acab...

bors added a commit that referenced this pull request Jun 13, 2023
chore: update dependencies

Hand-picked some dependencies to update. Looks pretty safe?

- `anyhow` 1.0.70 -> 1.0.71
- `base64` 0.21.0 -> 0.21.2
- `clap@4.2.1` 4.2.1 -> 4.3.3
- `flate2` 1.0.25 -> 1.0.26
- `git2` 0.17.1 -> 0.17.2
- `libgit2-sys` 0.15.1+1.6.4 -> 0.15.2+1.6.4
- `log` 0.4.17 -> 0.4.19
- `openssl` 111.25.3+1.1.1t -> 111.26.0+1.1.1u
- `pkg-config` 0.3.26 -> 0.3.27
- `proptest` 1.1.0 -> 1.2.0
- `pulldown-cmark` 0.9.2 -> 0.9.3
- `serde` 1.0.160 -> 1.0.164
- `serde_json` 1.0.95 -> 1.0.96
- `snapbox` 0.4.10 -> 0.4.11
- `tempfile` 3.5.0 -> 3.6.0
- `time` 0.3.20 -> 0.3.22
- `toml` 0.7.3 -> 0.7.4
- `toml_edit` 0.19.8 -> 0.19.10
- `url` 2.3.4 -> 2.4.0

### Additional information

This is a bit painful, shall we introduce some bot (dependant/renovate) to help this process.

In addition, we should have a job of `cargo update && cargo test` in our CI pipeline.
@ehuss
Copy link
Contributor

ehuss commented Jun 13, 2023

Oh, I didn't notice CI failed.

@bors r-

@bors bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 13, 2023
@ehuss
Copy link
Contributor

ehuss commented Jun 13, 2023

Do you want me to help with debugging that?

@ehuss
Copy link
Contributor

ehuss commented Jun 13, 2023

I'm not sure if that is a fluke. I hit the rerun button to see if it fails again.

I'm not sure why apache would respond with 503 Service Unavailable. Maybe it needs more time to start up? I would have thought that if it is accepting connections it should be ready.

@epage
Copy link
Contributor

epage commented Jun 13, 2023

Otherwise, if we use a bot, I would prefer to configure it to minimize the number of updates it does. I find that they generate a lot of noise otherwise. I'd also like to avoid doing unnecessary updates just before a beta branch. My impression is that renovate is more configurable and generally better, but I don't have much experience with either.

I've switched from Dependabot to RenovateBot.

Example config: https://github.com/crate-ci/cargo-release/blob/master/.github/renovate.json5

  • One PR for compatible upgrades
  • A PR per incompatible upgrades (we could just disable them)
  • Upgrade MSRV on a schedule
  • A dependency dashboard

Challenges

  • I don't know if there is a good way for us to schedule for a 6 week cadence
  • Setting an MSRV would be great but I don't know of a way to decouple the cadence of "immediate" for MSRV and "every couple weeks" for dependecies.

@bors
Copy link
Collaborator

bors commented Jun 13, 2023

☀️ Try build successful - checks-actions
Build commit: 0d5acab (0d5acab494ee22099c1574ec2af5718185098850)

@ehuss
Copy link
Contributor

ehuss commented Jun 13, 2023

@bors r+

Looks like it might have been a flaky error. I haven't seen it before, and I'm not sure what might have caused it. For posterity, here is the output:

---- https::self_signed_should_fail stdout ----
thread 'https::self_signed_should_fail' panicked at 'called `Result::unwrap()` on an `Err` value: process didn't exit successfully: `docker build --tag cargo-test-apache /home/runner/work/cargo/cargo/crates/cargo-test-support/containers/apache` (exit status: 1)
--- stdout
Sending build context to Docker daemon  6.656kB

Step 1/12 : FROM httpd:2.4-alpine
2.4-alpine: Pulling from library/httpd

--- stderr
received unexpected HTTP status: 503 Service Unavailable
', crates/cargo-test-support/src/containers.rs:102:14
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

If we see this again, we should look into it more. Perhaps the service just needs more time to start up.

@bors
Copy link
Collaborator

bors commented Jun 13, 2023

📌 Commit bf06fc8 has been approved by ehuss

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Jun 13, 2023
@bors
Copy link
Collaborator

bors commented Jun 13, 2023

⌛ Testing commit bf06fc8 with merge 1703e06...

@bors
Copy link
Collaborator

bors commented Jun 13, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 1703e06 to master...

@bors bors merged commit 1703e06 into rust-lang:master Jun 13, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 15, 2023
Update cargo

11 commits in 49b6d9e179a91cf7645142541c9563443f64bf2b..0c14026aa84ee2ec4c67460c0a18abc8519ca6b2
2023-06-09 17:21:19 +0000 to 2023-06-14 18:43:05 +0000
- fix(embedded): Don't append hash to bin names (rust-lang/cargo#12269)
- Fix version requirement example in Dependency Resolution, SemVer compatibility section (rust-lang/cargo#12267)
- Update triagebot links. (rust-lang/cargo#12265)
- Show a better error when container tests fail. (rust-lang/cargo#12264)
- chore: update dependencies (rust-lang/cargo#12261)
- refactor(embedded) (rust-lang/cargo#12262)
- docs: clarify the use of `default` branch instead of `main` by default (rust-lang/cargo#12251)
- docs: update changelog for 1.71 backport and 1.72 (rust-lang/cargo#12256)
- feat: Initial support for single-file packages (rust-lang/cargo#12245)
- test(z-flags): Verify `-Z` flags list is sorted (rust-lang/cargo#12224)
- refactor: registry data kinds cleanup (rust-lang/cargo#12248)

---

This commit also update LICENSE exceptions, as Cargo introduced a newer version of `dunce` and `blake3` as dependencies.

r? `@ghost`
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Jun 16, 2023
Update cargo

11 commits in 49b6d9e179a91cf7645142541c9563443f64bf2b..0c14026aa84ee2ec4c67460c0a18abc8519ca6b2
2023-06-09 17:21:19 +0000 to 2023-06-14 18:43:05 +0000
- fix(embedded): Don't append hash to bin names (rust-lang/cargo#12269)
- Fix version requirement example in Dependency Resolution, SemVer compatibility section (rust-lang/cargo#12267)
- Update triagebot links. (rust-lang/cargo#12265)
- Show a better error when container tests fail. (rust-lang/cargo#12264)
- chore: update dependencies (rust-lang/cargo#12261)
- refactor(embedded) (rust-lang/cargo#12262)
- docs: clarify the use of `default` branch instead of `main` by default (rust-lang/cargo#12251)
- docs: update changelog for 1.71 backport and 1.72 (rust-lang/cargo#12256)
- feat: Initial support for single-file packages (rust-lang/cargo#12245)
- test(z-flags): Verify `-Z` flags list is sorted (rust-lang/cargo#12224)
- refactor: registry data kinds cleanup (rust-lang/cargo#12248)

---

This commit also update LICENSE exceptions, as Cargo introduced a newer version of `dunce` and `blake3` as dependencies.

r? `@ghost`
@ehuss ehuss added this to the 1.72.0 milestone Jun 22, 2023
@weihanglo weihanglo deleted the dep-update branch August 3, 2023 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants