From 2e292985065d4a50b525e22e034370b17c11a7e1 Mon Sep 17 00:00:00 2001 From: John Alden Date: Tue, 2 Apr 2024 09:09:24 -0700 Subject: [PATCH 1/6] strip carriage returns from blacklist file --- script/build-win32.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build-win32.sh b/script/build-win32.sh index a26aaf4..b3544ac 100755 --- a/script/build-win32.sh +++ b/script/build-win32.sh @@ -45,7 +45,7 @@ fi echo "-- Deleting Unneccessary Files" cd "$DESTINATION" -xargs rm -rf <"$CURRENT_DIR/windows-blacklist.txt" +cat "$CURRENT_DIR/windows-blacklist.txt" | tr -d '\r' | xargs -d '\n' rm -rf if [[ "$GIT_LFS_VERSION" ]]; then # download Git LFS, verify its the right contents, and unpack it From 373d977d22e8523f2cca0fbaca9eca5baf06a228 Mon Sep 17 00:00:00 2001 From: John Alden Date: Tue, 2 Apr 2024 09:09:49 -0700 Subject: [PATCH 2/6] blacklist more files --- script/windows-blacklist.txt | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/script/windows-blacklist.txt b/script/windows-blacklist.txt index 9bf422f..da11ff9 100644 --- a/script/windows-blacklist.txt +++ b/script/windows-blacklist.txt @@ -5,9 +5,11 @@ cmd/start-ssh-agent.cmd cmd/start-ssh-pageant.cmd dev etc/package-versions.txt +etc/vimrc git-bash.exe git-cmd.exe mingw64/libexec/git-core/Atlassian.Bitbucket.dll +mingw64/libexec/git-core/av_libglesv2.dll mingw64/libexec/git-core/Avalonia.Base.dll mingw64/libexec/git-core/Avalonia.Controls.dll mingw64/libexec/git-core/Avalonia.DesignerSupport.dll @@ -22,14 +24,21 @@ mingw64/libexec/git-core/Avalonia.Remote.Protocol.dll mingw64/libexec/git-core/Avalonia.Skia.dll mingw64/libexec/git-core/Avalonia.Themes.Fluent.dll mingw64/libexec/git-core/Avalonia.Win32.dll -mingw64/libexec/git-core/av_libglesv2.dll mingw64/libexec/git-core/edit.dll mingw64/libexec/git-core/gcmcore.dll +mingw64/libexec/git-core/git-citool +mingw64/libexec/git-core/git-credential-wincred.exe +mingw64/libexec/git-core/git-credential-wincred.exe +mingw64/libexec/git-core/git-daemon.exe mingw64/libexec/git-core/git-gui mingw64/libexec/git-core/git-gui--askpass mingw64/libexec/git-core/git-gui--askyesno -mingw64/libexec/git-core/git-credential-wincred.exe mingw64/libexec/git-core/git-gui.tcl +mingw64/libexec/git-core/git-imap-send.exe +mingw64/libexec/git-core/git-instaweb +mingw64/libexec/git-core/git-p4 +mingw64/libexec/git-core/git-send-email +mingw64/libexec/git-core/git-svn mingw64/libexec/git-core/GitHub.dll mingw64/libexec/git-core/GitLab.dll mingw64/libexec/git-core/HarfBuzzSharp.dll @@ -94,4 +103,14 @@ mingw64/libexec/git-core/tk86.dll mingw64/libexec/git-core/zlib1.dll post-install.bat README.portable -tmp \ No newline at end of file +tmp +usr/bin/notepad +usr/bin/rvim +usr/bin/sshd +usr/bin/vi +usr/bin/view +usr/bin/vim.exe +usr/bin/vimdiff.exe +usr/bin/vimtutor +usr/bin/wordpad +usr/share/vim \ No newline at end of file From 95f58116524120a77f7959a6c83bca724560ca10 Mon Sep 17 00:00:00 2001 From: John Alden Date: Tue, 2 Apr 2024 12:28:24 -0700 Subject: [PATCH 3/6] fix shellcheck --- script/build-win32.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/build-win32.sh b/script/build-win32.sh index b3544ac..1be0ce5 100755 --- a/script/build-win32.sh +++ b/script/build-win32.sh @@ -14,8 +14,8 @@ if [ "$TARGET_ARCH" = "x64" ]; then DEPENDENCY_ARCH="amd64" MINGW_DIR="mingw64" else - DEPENDENCY_ARCH="x86" - MINGW_DIR="mingw32" + echo "Unsupported architecture" + exit 1 fi GIT_LFS_VERSION=$(jq --raw-output ".[\"git-lfs\"].version[1:]" dependencies.json) @@ -45,7 +45,7 @@ fi echo "-- Deleting Unneccessary Files" cd "$DESTINATION" -cat "$CURRENT_DIR/windows-blacklist.txt" | tr -d '\r' | xargs -d '\n' rm -rf +tr -d '\r' < "$CURRENT_DIR/windows-blacklist.txt" | xargs -d '\n' rm -rf if [[ "$GIT_LFS_VERSION" ]]; then # download Git LFS, verify its the right contents, and unpack it From e06868031f93533b2c0935c75b84bde1f898df11 Mon Sep 17 00:00:00 2001 From: John Alden Date: Tue, 2 Apr 2024 12:28:43 -0700 Subject: [PATCH 4/6] drop windows x86 --- .github/workflows/ci.yml | 2 ++ dependencies.json | 7 ------- script/generate-release-notes.ts | 4 ++-- script/update-git.ts | 5 ++--- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b004a7..f2d90c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,8 @@ jobs: exclude: - os: macos-11 arch: x86 + - os: windows-2019 + arch: x86 timeout-minutes: 20 steps: # We need to use Xcode 11.7 for maximum compatibility with older macOS (x64) diff --git a/dependencies.json b/dependencies.json index f60d0b2..da62726 100644 --- a/dependencies.json +++ b/dependencies.json @@ -8,13 +8,6 @@ "filename": "PortableGit-2.44.0-64-bit.7z.exe", "url": "https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/PortableGit-2.44.0-64-bit.7z.exe", "checksum": "1fc64ca91b9b475ab0ada72c9f7b3addbe69a6c8f520be31425cf21841cca369" - }, - { - "platform": "windows", - "arch": "x86", - "filename": "PortableGit-2.44.0-32-bit.7z.exe", - "url": "https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/PortableGit-2.44.0-32-bit.7z.exe", - "checksum": "e70c80672069907961f6db68b0db5e14ea0447f39c74cfd3c385882f3b934c6f" } ] }, diff --git a/script/generate-release-notes.ts b/script/generate-release-notes.ts index de50380..4a9cb48 100644 --- a/script/generate-release-notes.ts +++ b/script/generate-release-notes.ts @@ -4,10 +4,10 @@ import * as fs from 'fs' import { Octokit } from '@octokit/rest' export default class GenerateReleaseNotes { - // eight targeted OS/arch combinations + // seven targeted OS/arch combinations // two files for each targeted OS/arch // two checksum files for the previous - private SUCCESSFUL_RELEASE_FILE_COUNT = 8 * 2 * 2 + private SUCCESSFUL_RELEASE_FILE_COUNT = 7 * 2 * 2 private args = process.argv.slice(2) private expectedArgs = [ { diff --git a/script/update-git.ts b/script/update-git.ts index 526659f..1e2c305 100644 --- a/script/update-git.ts +++ b/script/update-git.ts @@ -204,13 +204,12 @@ async function run() { } const package64bit = await getPackageDetails(assets, body, 'amd64') - const package32bit = await getPackageDetails(assets, body, 'x86') - if (package64bit == null || package32bit == null) { + if (package64bit == null) { return } - updateGitDependencies(latestGitVersion, [package64bit, package32bit]) + updateGitDependencies(latestGitVersion, [package64bit]) console.log( `✅ Updated dependencies metadata to Git ${latestGitVersion} (Git for Windows ${version})` From 300a67044b1930531d4ce5c29cd67086eff90ffb Mon Sep 17 00:00:00 2001 From: John Alden Date: Tue, 2 Apr 2024 14:24:51 -0700 Subject: [PATCH 5/6] also remove docs and mintty --- script/windows-blacklist.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/windows-blacklist.txt b/script/windows-blacklist.txt index da11ff9..621797f 100644 --- a/script/windows-blacklist.txt +++ b/script/windows-blacklist.txt @@ -101,12 +101,14 @@ mingw64/libexec/git-core/System.ValueTuple.dll mingw64/libexec/git-core/tcl86.dll mingw64/libexec/git-core/tk86.dll mingw64/libexec/git-core/zlib1.dll +mingw64/share/doc post-install.bat README.portable tmp usr/bin/notepad usr/bin/rvim usr/bin/sshd +usr/bin/mintty.exe usr/bin/vi usr/bin/view usr/bin/vim.exe From c8470bbb8e6f5c8409208a649b5aa124e3590b86 Mon Sep 17 00:00:00 2001 From: John Alden Date: Tue, 2 Apr 2024 16:05:35 -0700 Subject: [PATCH 6/6] remove perl and svn --- script/windows-blacklist.txt | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/script/windows-blacklist.txt b/script/windows-blacklist.txt index 621797f..28c115e 100644 --- a/script/windows-blacklist.txt +++ b/script/windows-blacklist.txt @@ -5,6 +5,8 @@ cmd/start-ssh-agent.cmd cmd/start-ssh-pageant.cmd dev etc/package-versions.txt +etc/profile.d/perlbin.csh +etc/profile.d/perlbin.sh etc/vimrc git-bash.exe git-cmd.exe @@ -39,6 +41,7 @@ mingw64/libexec/git-core/git-instaweb mingw64/libexec/git-core/git-p4 mingw64/libexec/git-core/git-send-email mingw64/libexec/git-core/git-svn +mingw64/libexec/git-core/git-svn mingw64/libexec/git-core/GitHub.dll mingw64/libexec/git-core/GitLab.dll mingw64/libexec/git-core/HarfBuzzSharp.dll @@ -102,17 +105,45 @@ mingw64/libexec/git-core/tcl86.dll mingw64/libexec/git-core/tk86.dll mingw64/libexec/git-core/zlib1.dll mingw64/share/doc +mingw64/share/perl5 post-install.bat README.portable tmp +usr/bin/core_perl +usr/bin/mintty.exe +usr/bin/msys-perl5_38.dll +usr/bin/msys-svn_client-1-0.dll +usr/bin/msys-svn_delta-1-0.dll +usr/bin/msys-svn_diff-1-0.dll +usr/bin/msys-svn_fs_fs-1-0.dll +usr/bin/msys-svn_fs_util-1-0.dll +usr/bin/msys-svn_fs_x-1-0.dll +usr/bin/msys-svn_fs-1-0.dll +usr/bin/msys-svn_ra_local-1-0.dll +usr/bin/msys-svn_ra_serf-1-0.dll +usr/bin/msys-svn_ra_svn-1-0.dll +usr/bin/msys-svn_ra-1-0.dll +usr/bin/msys-svn_repos-1-0.dll +usr/bin/msys-svn_subr-1-0.dll +usr/bin/msys-svn_swig_perl-1-0.dll +usr/bin/msys-svn_swig_perl-1-0.dll +usr/bin/msys-svn_wc-1-0.dll usr/bin/notepad +usr/bin/perl.exe +usr/bin/perl5.38.2.exe usr/bin/rvim usr/bin/sshd -usr/bin/mintty.exe +usr/bin/vendor_perl usr/bin/vi usr/bin/view usr/bin/vim.exe usr/bin/vimdiff.exe usr/bin/vimtutor usr/bin/wordpad +usr/lib/perl5 +usr/share/licenses/perl-Net-SSLeay +usr/share/licenses/perl-TermReadKey +usr/share/licenses/perl-Try-Tiny +usr/share/nano/perl.nanorc +usr/share/perl5 usr/share/vim \ No newline at end of file