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

Lock file maintenance #3478

Merged
merged 2 commits into from
Oct 8, 2023
Merged

Lock file maintenance #3478

merged 2 commits into from
Oct 8, 2023

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Sep 11, 2023

Mend Renovate

This PR contains the following updates:

Update Change
lockFileMaintenance All locks refreshed

πŸ”§ This Pull Request updates lock files to use the latest dependency versions.


Configuration

πŸ“… Schedule: Branch creation - "before 4am on monday" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

β™» Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

πŸ‘» Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot force-pushed the renovate/lock-file-maintenance branch 10 times, most recently from 8844bfa to d488b8c Compare October 5, 2023 11:53
@djc
Copy link
Contributor

djc commented Oct 5, 2023

The failure here is probably because openssl-src got bumped from 111 to 300.

@renovate renovate bot force-pushed the renovate/lock-file-maintenance branch 4 times, most recently from 7c5f2e4 to 8f2580b Compare October 6, 2023 19:41
@rami3l
Copy link
Member

rami3l commented Oct 8, 2023

Claim.

@djc Thanks for your pointers! This seems to be an OpenSSLv3-specific problem.
Possibly related to https://stackoverflow.com/q/70464585:
I believe the CI error is due to a Perl component IPC/Cmd.pm left uninstalled in the Docker image.

On a Debian system this should be reachable from perl-modules that comes with a full perl installation, but some packages only rely on perl-base with is a minimal subset of perl files and that's why the CI used to build.

However, looking at

FROM rust-x86_64-unknown-linux-gnu
I have no idea how Perl gets set up πŸ€”

cc openssl/openssl#14541, sfackler/rust-openssl#1550

@rami3l rami3l self-assigned this Oct 8, 2023
@renovate renovate bot force-pushed the renovate/lock-file-maintenance branch from 8f2580b to 185a836 Compare October 8, 2023 02:02
@tgross35
Copy link

tgross35 commented Oct 8, 2023

Some followup in https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Get.20a.20Perl.20setup.20with.20.60IPC.2FCmd.2Epm.60.20in.20Rustup's.20CI.20image

@renovate
Copy link
Contributor Author

renovate bot commented Oct 8, 2023

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

⚠ Warning: custom changes will be lost.

@rami3l rami3l force-pushed the renovate/lock-file-maintenance branch from 2fcb36f to b29bb52 Compare October 8, 2023 09:54
@rami3l
Copy link
Member

rami3l commented Oct 8, 2023

Looking at #1815, the base image here seems to be https://github.com/rust-lang/rust/blob/e08de860365aa73653dc5fc45b09f194785f3e57/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile. Should we put this info in the docs somewhere?

@rami3l rami3l force-pushed the renovate/lock-file-maintenance branch from b29bb52 to e007902 Compare October 8, 2023 10:01
@rami3l rami3l force-pushed the renovate/lock-file-maintenance branch from e007902 to aa972e5 Compare October 8, 2023 10:11
@rami3l rami3l requested a review from djc October 8, 2023 10:14
@rami3l rami3l enabled auto-merge (rebase) October 8, 2023 10:16
@rami3l
Copy link
Member

rami3l commented Oct 8, 2023

Leaving a note for my future self (or anyone else it may concern):

#1724 (comment) points to rust-lang/rust#59420, which implies that in ci/fetch-rust-docker.bash we are downloading an S3-cached Docker image provided by rustc's CI.

By referring to this map:

# Use images from rustc master
case "$TARGET" in
aarch64-unknown-linux-gnu) image=dist-aarch64-linux ;;
aarch64-unknown-linux-musl) image=dist-arm-linux ;;

we are actually referring to Dockerfiles located in https://github.com/rust-lang/rust/tree/master/src/ci/docker/host-x86_64.

For example,

aarch64-unknown-linux-musl) image=dist-arm-linux ;;

means that for rust-aarch64-unknown-linux-musl:

FROM rust-aarch64-unknown-linux-musl

we should refer to https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile.

@rami3l rami3l disabled auto-merge October 8, 2023 12:13
@rami3l rami3l force-pushed the renovate/lock-file-maintenance branch from c24b4cd to d68f56e Compare October 8, 2023 12:36
@rami3l rami3l force-pushed the renovate/lock-file-maintenance branch from d68f56e to 44da850 Compare October 8, 2023 12:36
@rami3l rami3l enabled auto-merge (rebase) October 8, 2023 12:38
@alex
Copy link
Member

alex commented Oct 8, 2023

CI change lgtm

@djc
Copy link
Contributor

djc commented Oct 8, 2023

If I'm not misreading I only see comment changes, so how did the previous issues in CI actually get fixed?

@alex
Copy link
Member

alex commented Oct 8, 2023 via email

Copy link
Contributor

@djc djc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, missed that on my phone. LGTM!

For the future, might be nice to keep comment additions in a separate commit from the fix in the Dockerfile.

@rami3l rami3l merged commit 5bf3448 into master Oct 8, 2023
21 checks passed
@rami3l rami3l deleted the renovate/lock-file-maintenance branch October 8, 2023 20:08
@rami3l
Copy link
Member

rami3l commented Oct 9, 2023

@djc Oh I did exactly that to ensure both commits are green on CI.
I indeed forgot to add how the bug was fixed somewhere in this thread, really sorry about that!

@djc
Copy link
Contributor

djc commented Oct 9, 2023

@rami3l sorry, I meant one more commit: one to add comments, and one for the fix to add the Perl dependency.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants