Skip to content

git-artifacts: Update ARM64 GCM Core workaround#3085

Merged
dscho merged 1 commit into
git-for-windows:mainfrom
dennisameling:remove-gcm-core-workaround
Mar 10, 2021
Merged

git-artifacts: Update ARM64 GCM Core workaround#3085
dscho merged 1 commit into
git-for-windows:mainfrom
dennisameling:remove-gcm-core-workaround

Conversation

@dennisameling

Copy link
Copy Markdown
Member

We have moved and improved this logic to build-extra in git-for-windows/build-extra#331. More details in that PR.

if: matrix.arch.arm64 == true
shell: bash
run: |
printf '%s\n' '#!/bin/sh' 'exec /mingw32/libexec/git-core/git-credential-manager-core.exe "$@"' > arm64/bin/git-credential-manager-core

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.

I bet it works if it's put into arm64/libexec/git-core/ instead of arm64/bin/.

And honestly, I'd prefer that over the build-extra PR, to minimize the impact outside git-artifacts...

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@dscho that works, thanks! Just updated the commit accordingly.

I was curious as to what libexec does exactly, and found this definition:

libexec is meant for system daemons and system utilities executed by other programs. That is, the binaries put in this namespaced directory are meant for the consumption of other programs, and are not intended to be executed directly by users.

Learning every day 🚀

@dennisameling
dennisameling force-pushed the remove-gcm-core-workaround branch from 4842189 to c74e2c4 Compare March 8, 2021 08:35
@dennisameling dennisameling changed the title git-artifacts: Remove ARM64 GCM Core workaround git-artifacts: Update ARM64 GCM Core workaround Mar 8, 2021
@dscho

dscho commented Mar 8, 2021

Copy link
Copy Markdown
Member

Very nice! Now, the most important question: does it still fix the issue in your tests? 😉

@dennisameling
dennisameling force-pushed the remove-gcm-core-workaround branch from c74e2c4 to 5174918 Compare March 8, 2021 12:13
@dennisameling

dennisameling commented Mar 8, 2021

Copy link
Copy Markdown
Member Author

Just did a fresh installation based on the artifacts in https://github.com/dennisameling/git/actions/runs/632238966 (also deleted ~/.gitconfig), and it works! 🚀

Before:

PS C:\repos\demo-repo> git push
git: 'credential-manager-core' is not a git command. See 'git --help'.
Username for 'https://github.com':

After:

PS C:\repos\demo-repo> git push
Everything up-to-date

@dennisameling
dennisameling requested a review from dscho March 9, 2021 15:54
It turned out that our workaround doesn't work if the
git-credential-manager-core wrapper is put into the /arm64/bin folder,
but is does work when putting it into the /arm64/libexec folder.

This PR moves the git-credential-manager-core wrapper to /arm64/libexec.

Signed-off-by: Dennis Ameling <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
dscho force-pushed the remove-gcm-core-workaround branch from 5174918 to efa8abe Compare March 10, 2021 21:20
@dscho
dscho merged commit de8defe into git-for-windows:main Mar 10, 2021
@dscho dscho added this to the Next release milestone Mar 10, 2021
@dennisameling
dennisameling deleted the remove-gcm-core-workaround branch March 11, 2021 08:49
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