Skip to content

add a msys2-runtime-3.3 package#96

Merged
rimrul merged 3 commits into
git-for-windows:mainfrom
rimrul:msys2-runtime-3.3
May 8, 2023
Merged

add a msys2-runtime-3.3 package#96
rimrul merged 3 commits into
git-for-windows:mainfrom
rimrul:msys2-runtime-3.3

Conversation

@rimrul

@rimrul rimrul commented Apr 14, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

The first step of phase 2 of the current timeline(git-for-windows/git#4279 (comment))

rimrul
rimrul commented Apr 14, 2023
View reviewed changes
Comment thread msys2-runtime-3.3/PKGBUILD Outdated
@rimrul
rimrul force-pushed the msys2-runtime-3.3 branch from 6503211 to c7a6d01 Compare April 14, 2023 14:20
@rimrul
rimrul requested a review from dscho May 4, 2023 12:12
dscho
dscho reviewed May 8, 2023
View reviewed changes

@dscho dscho left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These changes look pretty good so far, thank you so much for working on this @rimrul!

I allowed myself to add a commit to trigger i686 builds for PRs containing the needle msys2-runtime-3.3 in their title, as this here PR does. I hope to get an artifact that I can then test.

Comment thread msys2-runtime-3.3/update-patches.sh Outdated
Comment thread msys2-runtime-3.3/tests/do_new.bat Outdated
@dscho
dscho force-pushed the msys2-runtime-3.3 branch 2 times, most recently from 8854cec to e1b4ce5 Compare May 8, 2023 12:35
@dscho

dscho commented May 8, 2023

Copy link
Copy Markdown
Member

@rimrul from my side, I consider this one done (modulo the final interactive rebase). Anything else you want to see before flipping this to "ready-for review"?

dscho and others added 3 commits May 8, 2023 18:23
@dscho @rimrul
msys2-runtime: remove debugging left-overs
27cf9ef 
These Batch files hail from over 8 years ago, from ae83bac
(msys2-runtime: New mount table sorting (WIP), 2014-09-21) to be
precise.

In all that time, there has not been a hint that they had been useful.
So let's drop them.

Signed-off-by: Johannes Schindelin <[email protected]>
@rimrul
msys2-runtime: add a msys2-runtime-3.3 package for continued x86 comp…
982e6d4 
…atibility

We plan to update the main `msys2-runtime` package to 3.4.x before Git for Windows v2.41.0, [1]
but Cygwin 3.4.x only supports AMD64 [2]. Create  a separate Package for Version 3.3 of the runtime
like MSys2 [3] to allow us to provide x86 releases according to our x86 deprecation timeline [1].

[1] git-for-windows/git#4279
[2] https://github.com/cygwin/cygwin/blob/HEAD/winsup/cygwin/release/3.4.0#L6
[3] msys2#3379

Signed-off-by: Matthias Aßhauer <[email protected]>
@dscho @rimrul
ci: for msys2-runtime-3.3 PRs, build the i686 variant
b7b0dfc 
Signed-off-by: Johannes Schindelin <[email protected]>
@rimrul
rimrul force-pushed the msys2-runtime-3.3 branch from 5b8ee07 to b7b0dfc Compare May 8, 2023 16:25
@rimrul
rimrul marked this pull request as ready for review May 8, 2023 16:25
dscho
dscho approved these changes May 8, 2023
View reviewed changes

@dscho dscho left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yeah!

@dscho

dscho commented May 8, 2023 •
edited by gitforwindowshelper Bot
Loading

Copy link
Copy Markdown
Member

/deploy msys2-runtime-3.3

The x86_64 and the i686 workflow runs were started.

@dscho

dscho commented May 8, 2023

Copy link
Copy Markdown
Member

I guess technically we do not need the x86_64 builds, but what's the harm, eh? 😁

@rimrul

rimrul commented May 8, 2023

Copy link
Copy Markdown
Member Author

Yes, that should be fine.

@rimrul
rimrul merged commit ff8e8ef into git-for-windows:main May 8, 2023
@rimrul
rimrul deleted the msys2-runtime-3.3 branch May 8, 2023 19:05
@dscho

dscho commented May 8, 2023

Copy link
Copy Markdown
Member

I think the next step should be a PR in git-sdk-32 that teaches the sync job (or more correctly: update-via-pacman.ps1 to replace the msys2-runtime (if installed) package by the msys2-runtime-3.3.

@dscho

dscho commented May 9, 2023

Copy link
Copy Markdown
Member

I guess technically we do not need the x86_64 builds, but what's the harm, eh? 😁

So now I know what the harm is: https://github.com/git-for-windows/git-sdk-64/actions/runs/4921830149/jobs/8792046619 says this:

[...]
:: Starting core system upgrade...
warning: terminate other MSYS2 programs before proceeding
resolving dependencies...
looking for conflicting packages...
error: failed to prepare transaction (could not satisfy dependencies)
:: installing msys2-runtime (3.4.6-2) breaks dependency 'msys2-runtime=3.3.6' required by msys2-runtime-devel
[...]

Same problem in the sync job of git-sdk-arm64.

This suggests to me that the -3.3- in msys2-runtime-3.3-3.3.6-1 is causing problems.

I fear that we'll have to repo-remove it ASAP, and hope that simply renaming the package to msys2-runtime3.3 will work...

@dscho

dscho commented May 9, 2023

Copy link
Copy Markdown
Member

Hmm. MSYS2 does not seem to have any problems with this package name! See https://packages.msys2.org/package/msys2-runtime-3.3-devel?repo=msys&variant=x86_64

Also:

$ tar tvf /var/lib/pacman/sync/msys.db | grep msys2-runtime
drwxr-xr-x repo/repo         0 2023-04-02 10:39 msys2-runtime-3.3-3.3.6-5/
-rw-r--r-- repo/repo      1514 2023-04-02 10:39 msys2-runtime-3.3-3.3.6-5/desc
drwxr-xr-x repo/repo         0 2023-04-02 10:39 msys2-runtime-3.3-devel-3.3.6-5/
-rw-r--r-- repo/repo      1562 2023-04-02 10:39 msys2-runtime-3.3-devel-3.3.6-5/desc
drwxr-xr-x repo/repo         0 2023-04-02 10:39 msys2-runtime-3.4.6-2/
-rw-r--r-- repo/repo      1491 2023-04-02 10:39 msys2-runtime-3.4.6-2/desc
drwxr-xr-x repo/repo         0 2023-04-02 10:39 msys2-runtime-devel-3.4.6-2/
-rw-r--r-- repo/repo      1534 2023-04-02 10:39 msys2-runtime-devel-3.4.6-2/desc

So the problem must lie with Git for Windows' tooling... I suspect pacman-helper.sh...

@dscho

dscho commented May 9, 2023

Copy link
Copy Markdown
Member

So the problem must lie with Git for Windows' tooling... I suspect pacman-helper.sh...

Indeed, it looks that way. I consistently used the pattern ${dirname%%-[0-9]*} (e.g. here) in Git for Windows' tooling to deduce the package name from the directory name in the tar files /var/lib/pacman/sync/*.db. But Pacman actually uses ${dirname%-*-*}, see e.g. here.

Gotta fix that in All The Places. And then fix Git for Windows' Pacman databases...

@dscho

dscho commented May 9, 2023

Copy link
Copy Markdown
Member

Gotta fix that in All The Places.

See git-for-windows/build-extra#499 for that fix.

And then fix Git for Windows' Pacman databases...

Done in https://github.com/git-for-windows/git-for-windows-automation/actions/runs/4930413416/jobs/8811298893. The git-sdk-arm64 sync worked and I started the re-run of the git-sdk-64 sync, too.

This was referenced May 12, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dscho dscho dscho approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rimrul @dscho