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

Remove msys2 hacks and vendor the whole thing #65767

Closed
pietroalbini opened this issue Oct 24, 2019 · 4 comments · Fixed by #73188
Closed

Remove msys2 hacks and vendor the whole thing #65767

pietroalbini opened this issue Oct 24, 2019 · 4 comments · Fixed by #73188
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. P-medium Medium priority T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Comments

@pietroalbini
Copy link
Member

pietroalbini commented Oct 24, 2019 •
edited
Loading

On 2019-10-24 we had a CI outage due to the ca-certificates msys2 package being broken. The hack @mati865 implemented (:heart:) is to download an older, known good package beforehand and install it after msys2 updated its packages.

Once msys2/MINGW-packages#5887 is fixed we should revert the hack, but I think at this point it's worth investing in vendoring msys2 as a whole.
@pietroalbini pietroalbini added C-enhancement Category: An issue proposing an enhancement or a PR with one. P-high High priority T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. C-cleanup Category: PRs that clean code up or issues documenting cleanup. and removed C-enhancement Category: An issue proposing an enhancement or a PR with one. labels Oct 24, 2019
@crlf0710
Copy link
Member

msys2 is using pacman and other tools from archlinux distro. Arch Linux provides per-day official repositories snapshots. User can "pin" to a specific date. I think it is possible to reuse that mechanism to vendoring msys2 as a whole, by providing a mirror of a specific date's version.

See here for more descriptions about it.

@mati865
Copy link
Contributor

mati865 commented Oct 24, 2019

@crlf0710 that would be nice but msys doesn't remove old packages from their repo so the mirror would be enormous.
Search for mingw-w64-x86_64-qt5 in http://repo.msys2.org/mingw/x86_64, only those packages take dozens of GiB.

Also extracting it from archive would make CI a bit faster because you won't be modifying thousands of small files over and over. On Linux that is not a problem but pacman working through cygwin emulation a bit struggles on this part.

This was referenced Oct 30, 2019
Merged
Merged
bors added a commit that referenced this issue Oct 30, 2019
@bors
Auto merge of #65956 - pietroalbini:beta-revert-msys2-hack, r=Mark-Si…
f6404c5 
…mulacrum

[beta] ci: revert msys2 ca-certificates hack

The hack was added because upstream msys2 broke the ca-certificates package, but since then it has been fixed. This reverts CI to use the upstream package.

Part of #65767
r? @Mark-Simulacrum
Centril added a commit to Centril/rust that referenced this issue Oct 31, 2019
@Centril
Rollup merge of rust-lang#65955 - pietroalbini:master-revert-msys2-ha…
ce64b17 
…ck, r=Mark-Simulacrum

ci: revert msys2 ca-certificates hack

The hack was added because upstream msys2 broke the ca-certificates package, but since then it has been fixed. This reverts CI to use the upstream package.

Part of rust-lang#65767
@pietroalbini pietroalbini added P-medium Medium priority and removed P-high High priority labels Nov 12, 2019
@pietroalbini
Copy link
Member Author

No update on this, planning to discuss what to vendor at the all hands.

@pietroalbini pietroalbini added P-high High priority P-medium Medium priority and removed P-medium Medium priority P-high High priority labels Mar 10, 2020
@pietroalbini pietroalbini removed their assignment Apr 1, 2020
@aidanhs
Copy link
Member

aidanhs commented Jun 6, 2020

At the last infra meeting we decided a good step is to move towards using the pre-installed msys2 packages. In theory this is as simple as removing the msys2 installation step and pointing things at the right location on the images in CI.

@mati865 mati865 mentioned this issue Jun 9, 2020
Merged
@bors bors closed this as completed in d3d3a14 Jun 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. P-medium Medium priority T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Use preinstalled msys2 mati865/rust
4 participants
@crlf0710 @aidanhs @mati865 @pietroalbini