From 998d7240811370da653d3f37f389c3293e224424 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 13 Aug 2024 20:35:26 +0200
Subject: [PATCH 1/3] 7z.sfx: update to v24.08

This corresponds to the commit 4e0cd6fa (Add a Dependabot configuration,
2024-06-28) of
https://github.com/git-for-windows/7-Zip/commits/v24.08-VS2022-sfx and
the artifacts have been copied from the workflow run at
https://github.com/git-for-windows/7-Zip/actions/runs/10374851525.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 7-Zip/7zS.sfx  | Bin 240128 -> 240128 bytes
 7-Zip/7zSD.sfx | Bin 159744 -> 159744 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/7-Zip/7zS.sfx b/7-Zip/7zS.sfx
index 1d0fce6c888ffb01a4f6a65451c384604e812b15..51bc8aba88815896a8c092303a8bf1af7bef2344 100644
GIT binary patch
delta 229
zcmZp;!q;$xZ-Nb@z(iZ;`f0o@K9_Q`<Y9QGNT%F9Ab+MvzMM0V7JQ#6cN|RT$sGjK
z`Evik@_AtKnIbuIm%;pOxtl=xQcku!JCHv9B1x_lOiz^u$zRI(D}MpZ&j70r%1q7x
z+9@N?fCd6w85n#RSs7dx?B1-*c$aCS0Y?){8w=w$7N(Lv%s|nt<;;ntoE!`iV2vEx
YAC@vRGcsCie_F<D4x(i%m>(Mg0OI9MU;qFB

delta 210
zcmZp;!q;$xZ-Nb@#6(-?`aWJ3-%~kRaxmN|k|}=-$Zr(MmyZV0obNN`?}O<)`I}%m
zU;a5*J`XJ3D3T+88qCj@KM15x<z&mr1L>PDlH})t>8Wxc`BOQ6<xYV48DRB6naLSI
zI~nCBDoRWiVB}!-+FQ3-n(;1E6H6Nl<2Dwil0P7!t>w&#rJU>x5)2@~zWre-GczNj
R`Szz}%;q3kwu1SwApj{lOkn^3

diff --git a/7-Zip/7zSD.sfx b/7-Zip/7zSD.sfx
index ca6f080ecd1ba52c62126f9de13f14b4c912066e..7ab1424a80722b5488d13ed1b49f3daafb93bb0c 100644
GIT binary patch
delta 208
zcmZp8z}fJCb3#LX%BOZ#g~>0&U|92YRhSNt|5)HfxDuFt6|N4Z--hdg={MoFKsx*N
z+i*oN{T@oc2-gPk6(+w3`wXN_#UF;3gK4oakUE9Qbzva$OvPV=)dyuJX8`RK31fhQ
z09OVEA4XP&lm)w+g&DUCGcs<x&kW>jKmLGGFq4ymK?1ChWBWr-CT2!Pi|tRnn9M=6
JtPj&;WdOqzRWtwq

delta 208
zcmZp8z}fJCb3#LX%%^rXiODZRVOa2WRj3G%e_P;1h!mK96(SF&--d{S={F&)KsxyK
z+Ym`G{T@oc2oVPIB__WJJq@I}#UF<FgK4o)kUELUb)g{hxW!+C)dyuJX8`RK31xtS
z09OVEA4XONm%Vk(!i?L685uX;X9jY%AAi6on90e`AOTj$zWt#m6Eh>D`Szz?Oy(e3
J)`#h_G5~B2QbPa$


From c5f06227395365a9304dcf0a88a34927adb8f7c1 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 13 Aug 2024 20:41:03 +0200
Subject: [PATCH 2/3] ci: test 7-Zip artifact when it is updated

When a PR touches `7-Zip/`, we want to make sure that it verifies that
it works correctly in Portable Git (which is based on 7-Zip, after all,
and uses its self-extracting module, or more precisely: Git for Windows'
fork of 7-Zip's self-extracting module).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8dfebc8e6b..6e2565ba07 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,6 +36,7 @@ jobs:
               -e '/^make-file-list\.sh$/ainstaller/' \
               -e '/^make-file-list\.sh$/aportable/' \
               -e '/^make-file-list\.sh$/amingit/' \
+              -e '/^7-Zip\//aportable/' \
               -e 's|^\(installer/\).*|\1|' \
               -e 's|[^/]*$||' |
             sort -u >touched.txt &&

From 47366abb05cc754b106e429e9c6d90f88936c04b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 13 Aug 2024 22:35:04 +0200
Subject: [PATCH 3/3] ci(portable): when building Portable Git, also test it

Just like the installer, we can run the Portable Git self-extractor and
validate that it works as intended.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/main.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e2565ba07..7dfc07554b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -181,6 +181,30 @@ jobs:
           # cannot test SSH keys in read-only mode, skip test for now
           sed -i 's|git@ssh.dev.azure.com:v3/git-for-windows/git/git|https://github.com/git/git|' $checklist &&
           sh -x $checklist
+      - name: extract Portable Git
+        if: matrix.directory == 'portable'
+        shell: pwsh
+        run: |
+          $exePath = Get-ChildItem -Path ${{ steps.build.outputs.result }}/*.7z.exe | %{$_.FullName}
+          Get-ChildItem -Path "$exePath"
+          $installer = Start-Process -PassThru -Wait -FilePath "$exePath" -ArgumentList "-o portable-git -y"
+          $exitCode = $installer.ExitCode
+          if ($exitCode -ne 0) {
+            Write-Host "::error::Extracting the Portable Git failed with exit code $exitCode!"
+            exit 1
+          }
+          Get-ChildItem -Path "portable-git"
+          "$PWD\portable-git\usr\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
+          "$PWD\portable-git\mingw64\bin" | Out-File -Encoding ascii -Append $env:GITHUB_PATH
+      - name: validate
+        if: matrix.directory == 'portable'
+        shell: bash
+        run: |
+          set -x &&
+          root="$(cygpath -aw /)" &&
+          test "${root%portable-git}" != "$root" &&
+          git.exe version --build-options >version &&
+          cat version
   sdk-artifacts:
     needs: determine-packages
     if: needs.determine-packages.outputs.test-sdk-artifacts == 'true'