Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/actions/environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ runs:
# zstd is needed for cross OS actions/cache but missing from windows-11-arm
# https://github.com/actions/partner-runner-images/issues/99
- name: Install zstd on Windows ARM64
if: runner.os == 'Windows' && runner.arch == 'ARM64'
shell: pwsh
run: choco install zstandard
uses: ./.github/actions/install-zstd

# See https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode
- name: Pin the Xcode Version
Expand Down
26 changes: 26 additions & 0 deletions .github/actions/install-zstd/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Install zstd on Windows ARM64
description: |
zstd is needed for cross OS actions/cache but missing from windows-11-arm
(https://github.com/actions/partner-runner-images/issues/99). Once the issue
is resolved, this action can be removed.
inputs:
version:
description: 'zstd version'
required: false
default: '1.5.7'

runs:
using: composite
steps:
- name: Install zstd
if: runner.os == 'Windows' && runner.arch == 'ARM64'
shell: pwsh
env:
ZSTD_VERSION: ${{ inputs.version }}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a way to use sha pinning here?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for flagging it. we can should verify the checksum. would this do?

run: |
$url = "https://github.com/facebook/zstd/releases/download/v$env:ZSTD_VERSION/zstd-v$env:ZSTD_VERSION-win64.zip"
$installDir = "$env:RUNNER_TOOL_CACHE\zstd-v$env:ZSTD_VERSION-win64"
Invoke-WebRequest -OutFile "$env:TEMP\zstd.zip" -Uri $url
Expand-Archive -Path "$env:TEMP\zstd.zip" -DestinationPath $env:RUNNER_TOOL_CACHE -Force
echo "$installDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
& "$installDir\zstd.exe" --version
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ jobs:
# zstd is needed for cross OS actions/cache but missing from windows-11-arm
# https://github.com/actions/partner-runner-images/issues/99
- name: Install zstd on Windows ARM64
if: runner.os == 'Windows' && runner.arch == 'ARM64'
shell: pwsh
run: choco install zstandard
uses: ./.github/actions/install-zstd

- uses: actions/cache@v4
id: cache
Expand Down
Loading