Skip to content

Commit

Permalink
Merge pull request #575 from dscho/update-to-7-Zip-24.08
Browse files Browse the repository at this point in the history
7z.sfx: update to v24.08
  • Loading branch information
dscho authored Aug 14, 2024
2 parents 17b7b1c + 47366ab commit cb70db9
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -180,6 +181,30 @@ jobs:
# cannot test SSH keys in read-only mode, skip test for now
sed -i 's|[email protected]: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'
Expand Down
Binary file modified 7-Zip/7zS.sfx
Binary file not shown.
Binary file modified 7-Zip/7zSD.sfx
Binary file not shown.

0 comments on commit cb70db9

Please sign in to comment.