Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add arm64 support for Git for Windows and update to 2.47.1 #515

Merged
merged 10 commits into from
Jan 21, 2025

Conversation

dennisameling
Copy link
Contributor

Git for Windows added support for arm64 releases in their 2.47.1 version. Let's add support for it in the update-git.ts script.

I also ran the update-git.ts script after adding this change, which correctly added the arm64 version of Git to dependencies.json. I'll leave it up to you if you also want to include that commit already, or if you want to address the version bump separately.

Ref: https://github.com/git-for-windows/git/releases/tag/v2.47.1.windows.1
Ref: git-for-windows/git#3107 (comment)

@dennisameling dennisameling marked this pull request as draft November 26, 2024 14:01
dennisameling and others added 4 commits November 26, 2024 15:02
Git for Windows added support for arm64 releases in their 2.47.1 version. Let's add support for it in the `update-git.ts` script.

Ref: https://github.com/git-for-windows/git/releases/tag/v2.47.1.windows.1
Ref: git-for-windows/git#3107 (comment)
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
This updates Git by running the `update-git.ts` script, which automatically added the arm64 version of Git as well.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git LFS has supported Windows arm64 since 2021. Let's add it to the dependencies, now that Git itself also support it.

Ref: git-lfs/git-lfs#4586
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Now that the update-git-lfs.ts script has been updated to include Windows arm64 binaries, running `npm run update-git-lfs` automatically added the Windows arm64 binary to `dependencies.json`.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
@dennisameling dennisameling force-pushed the git-arm64-support branch 2 times, most recently from e63c685 to 15c67ff Compare November 26, 2024 14:28
Now that we're getting native arm64 binaries for both Git and Git LFS, we can start leveraging them in the `build-win32.sh` script.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Now that Windows arm64 is also supported, we can add it to CI and simplify the pipeline while at it.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
@dennisameling dennisameling marked this pull request as ready for review November 26, 2024 14:34
@dennisameling
Copy link
Contributor Author

@sergiou87 @niik @tidy-dev this might be of interest to y'all 😊

@sergiou87
Copy link
Member

You are the best @dennisameling 🥹🥹🥹🥹🥹

script/build-win32.sh Outdated Show resolved Hide resolved
Copy link
Member

@sergiou87 sergiou87 left a comment

Choose a reason for hiding this comment

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

It looks great! 🎉 🥹

@dennisameling
Copy link
Contributor Author

@sergiou87 anything I can do to get this merged? I've also prepared dugite to start using these updated native deps. Thanks!

@sergiou87
Copy link
Member

Hey @dennisameling !! Later today I will talk to the team about this, but I think we will need to wait for 1 month or so (because of holidays + other stuff going on), if everything goes well everything should be merged in January, and maybe shipped in February?

@sergiou87
Copy link
Member

@dennisameling checked with the team and yeah, unfortunately this will have to wait 😭

No worries, I can't stop thinking about getting this merged 😂 So I will let you know as soon as we're unblocked 😃

@dennisameling
Copy link
Contributor Author

No rush, was just curious if there were any blockers on my end 😊 thanks for all the hard work!!

@sergiou87
Copy link
Member

@dennisameling you have probably seen some movement 😅 Do you mind updating this PR with the latest git binaries with fixes for these vulnerabilities? 🙏

Thank you 🙇‍♂️

@dennisameling
Copy link
Contributor Author

It looks like Git 2.48.1 was released, but GfW is slightly behind, so I just went with 2.47.1.2 for now 👍🏼

Copy link
Member

@sergiou87 sergiou87 left a comment

Choose a reason for hiding this comment

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

Love it! Let's get this merged 🥹

@sergiou87 sergiou87 merged commit db3ebfe into desktop:master Jan 21, 2025
11 checks passed
@dennisameling dennisameling deleted the git-arm64-support branch January 21, 2025 15:17
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants