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

Fix update-via-pacman.ps1 #88

Merged
merged 3 commits into from
Dec 29, 2024

Conversation

dscho
Copy link
Member

@dscho dscho commented Dec 29, 2024

The sync workflow runs are broken ever since pacman wanted to be upgraded.

The reason is that pacman comes with a new pacman.conf, and we have to re-patch that file to add Git for Windows' Pacman repositories, but that re-patching is done via mingw-w64-git-extra's post-install script, which is currently called by update-via-pacman.ps1 in a way that does not work.

This PR addresses this: It ensures that /mingw64/bin/git.exe is in the PATH, and that the post-install script is run in the root directory of the SDK as it expects to be run.

The post-install script of `git-extra` (which we source manually)
assumes that the native `git.exe` is in the `PATH`. Let's make it so.

Signed-off-by: Johannes Schindelin <[email protected]>
The post-install script is supposed to be run in the root directory of
the SDK. Let's do that, then.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho self-assigned this Dec 29, 2024
bash-completion (2.15.0-1 -> 2.16.0-1)
filesystem (2023.02.07-3 -> 2024.12.18-1)
libguile (3.0.10-1 -> 3.0.10-2)
mingw-w64-i686-crt-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-i686-headers-git (12.0.0.r446.ga2d19218d-2 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-i686-libmangle-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-i686-libwinpthread-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-i686-tools-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-i686-winpthreads-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-x86_64-crt-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-x86_64-headers-git (12.0.0.r446.ga2d19218d-2 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-x86_64-libmangle-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-x86_64-libwinpthread-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-x86_64-tools-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
mingw-w64-x86_64-winpthreads-git (12.0.0.r446.ga2d19218d-1 -> 12.0.0.r459.g63f3f2846-1)
msys2-launcher (1.5-2 -> 1.5-3)
pacman (6.1.0-9 -> 6.1.0-10)
pacman-mirrors (20240523-1 -> 20241217-1)

Signed-off-by: Git for Windows Build Agent <[email protected]>
@dscho
Copy link
Member Author

dscho commented Dec 29, 2024

This PR will need to be ported to git-sdk-32 and git-sdk-arm64, too.

@dscho dscho merged commit 49054d5 into git-for-windows:main Dec 29, 2024
14 of 20 checks passed
@dscho
Copy link
Member Author

dscho commented Dec 29, 2024

The ci-artifacts tests are unfortunately currently expected to time out :-(

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.

1 participant