diff --git a/.generated.NoMobile.slnx b/.generated.NoMobile.slnx index f1cdd99800..d6fd58d14f 100644 --- a/.generated.NoMobile.slnx +++ b/.generated.NoMobile.slnx @@ -17,9 +17,6 @@ - - - diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml index 930d8fa3ea..49b2afb310 100644 --- a/.github/actions/environment/action.yml +++ b/.github/actions/environment/action.yml @@ -38,11 +38,6 @@ runs: sudo apt-get update sudo apt-get install -y gcc-arm-linux-gnueabihf libc6:armhf - # 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 - uses: ./.github/actions/install-zstd - # See https://github.com/actions/runner-images/blob/main/images/macos/macos-26-Readme.md#xcode # Also https://github.com/dotnet/macios/issues/21762#issuecomment-3424033859 (don't reference symlinks) - name: Pin the Xcode Version diff --git a/.github/actions/install-zstd/action.yml b/.github/actions/install-zstd/action.yml deleted file mode 100644 index fa103b0ec5..0000000000 --- a/.github/actions/install-zstd/action.yml +++ /dev/null @@ -1,36 +0,0 @@ -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' - checksum: - description: 'zstd checksum' - required: false - default: 'acb4e8111511749dc7a3ebedca9b04190e37a17afeb73f55d4425dbf0b90fad9' - -runs: - using: composite - steps: - - name: Install zstd - if: runner.os == 'Windows' && runner.arch == 'ARM64' - shell: pwsh - env: - ZSTD_VERSION: ${{ inputs.version }} - ZSTD_CHECKSUM: ${{ inputs.checksum }} - 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 - $checksum = (Get-FileHash "$env:TEMP\zstd.zip" -Algorithm SHA256).Hash.ToLower() - if ($checksum -ne $env:ZSTD_CHECKSUM) { - Write-Error "zstd checksum verification failed. Expected: $env:ZSTD_CHECKSUM, Actual: $checksum" - exit 1 - } - 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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8d197d99e..13f0914256 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,11 +52,6 @@ jobs: - run: git submodule update --init modules/sentry-native - # 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 - uses: ./.github/actions/install-zstd - - id: cache uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: diff --git a/Sentry.slnx b/Sentry.slnx index f1cdd99800..d6fd58d14f 100644 --- a/Sentry.slnx +++ b/Sentry.slnx @@ -17,9 +17,6 @@ - - -