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

Prevent different msys2 runtime versions from sharing cygheaps (targeting msys2-runtime v3.5) #4773

Conversation

dscho
Copy link
Contributor

@dscho dscho commented Jul 9, 2024

This corresponds to msys2/msys2-runtime#219.

dscho added 3 commits July 9, 2024 09:08
When initializing the bare `msys2-runtime` repository that usually
`makepkg` would have initialized for us, do configure the remote URL
that subsequent `makepkg` runs will expect because of the one recorded
in `PKGBUILD`.

Signed-off-by: Johannes Schindelin <[email protected]>
…e Cygwin code

As of v6.1.0, Pacman no longer generates `SKIP` as SHA-256 checksums for
Git repositories, as per the release notes at
https://gitlab.archlinux.org/pacman/pacman/-/blob/v6.1.0/NEWS?ref_type=tags#L21:

> - Add checksum support for git/mercurial/bzr sources

Instead of outputting `SKIP`, Pacman now runs `git -c core.abbrev=no
archive --format tar <branch-or-tag> | sha256sum` and uses the result:
https://gitlab.archlinux.org/pacman/pacman/-/commit/2fc2ab6cf0fbb93e1b3182a1997d3c9ffc9fc0fd

Unfortunately, the output of `git archive` is not stable. For one, the
`core.autoCRLF` setting (which defaults to `true` in Git for Windows)
affects the result.

Let's ensure that that `core.autoCRLF` setting is forced to `false`,
with the idea to add other settings as required.

Signed-off-by: Johannes Schindelin <[email protected]>
…cygheaps

This commit corresponds to msys2/msys2-runtime#219.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho marked this pull request as ready for review July 9, 2024 07:38
@lazka lazka merged commit 6838e23 into msys2:master Jul 9, 2024
2 checks passed
@lazka
Copy link
Member

lazka commented Jul 9, 2024

thanks!

@dscho dscho deleted the prevent-different-msys2-runtime-versions-from-sharing-cygheaps-v3.5.3 branch July 9, 2024 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants