Merge pull request #4 from gitkraken/fix-windows-file-blacklist

fix windows-blacklist
gitkraken · Apr 2, 2024 · d222a2d · d222a2d
2 parents 308cbb4 + c8470bb
commit d222a2d
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 18 deletions.
diff --git 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
@@ -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/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"
-xargs rm -rf <"$CURRENT_DIR/windows-blacklist.txt"
+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

diff --git 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
@@ -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})`

diff --git a/script/windows-blacklist.txt b/script/windows-blacklist.txt
@@ -5,9 +5,13 @@ 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
 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 +26,22 @@ 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/git-svn
 mingw64/libexec/git-core/GitHub.dll
 mingw64/libexec/git-core/GitLab.dll
 mingw64/libexec/git-core/HarfBuzzSharp.dll
@@ -92,6 +104,46 @@ 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
+mingw64/share/perl5
 post-install.bat
 README.portable
-tmp
+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/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