Skip to content

Commit daff820

Browse files
committed
Remove Info-ZIP dependency from CI
The willus.com site has bot protection that causes Invoke-WebRequest to fail reliably. The zip command was only needed by windows-package.sh for release packaging, not by unit tests or builds. Replace it with PowerShell's built-in Compress-Archive. Signed-off-by: Thomas Hallgren <thomas@tada.se>
1 parent d3bff59 commit daff820

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

.github/actions/install-dependencies/action.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,6 @@ runs:
4545
run: |
4646
# Use make from Git for Windows (pre-installed on runners)
4747
echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
48-
- if: runner.os == 'Windows'
49-
name: download Info-ZIP
50-
uses: nick-fields/retry/@v3
51-
with:
52-
max_attempts: 3
53-
timeout_minutes: 1
54-
shell: pwsh
55-
command: |
56-
$ErrorActionPreference = 'Stop'
57-
# Download Info-ZIP (Git for Windows only has unzip, not zip)
58-
Invoke-WebRequest -Uri "https://www.willus.com/archive/zip64/infozip_binaries_win32.zip" -OutFile infozip.zip
59-
Expand-Archive -Path infozip.zip -DestinationPath C:\infozip
60-
echo "C:\infozip" | Out-File -FilePath $env:GITHUB_PATH -Append
6148
- if: runner.os == 'Windows'
6249
name: download winfsp
6350
uses: nick-fields/retry/@v3

packaging/windows-package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ cp "${BINDIR}/telepresence.exe" "${ZIPDIR}/telepresence.exe"
5454
# Copy powershell install script into $ZIPDIR
5555
cp "${SCRIPT_DIR}/install-telepresence.ps1" "${ZIPDIR}/install-telepresence.ps1"
5656

57-
zip -r -j "${BINDIR}/telepresence.zip" "${ZIPDIR}"
57+
powershell -Command "Compress-Archive -Path '${ZIPDIR}/*' -DestinationPath '${BINDIR}/telepresence.zip'"
5858

5959
# Generate installer
6060
cp "${SCRIPT_DIR}/sidebar.png" "${ZIPDIR}/sidebar.png"

0 commit comments

Comments
 (0)