diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d1dfad8..d40be54 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -64,15 +64,10 @@ jobs: $installs = @( @{ Name = 'Chocolatey'; Url = 'https://chocolatey.org/install.ps1'; Action = { & "${{github.workspace}}\install.ps1" }}, - @{ Name = 'Visual Studio 2022 Build Tools (aarch64)'; Action = { - choco install visualstudio2022buildtools -y --no-progress --silent --package-parameters '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.Windows11SDK.22621' - }}, - @{ Name = 'Rust (nightly, aarch64)'; Url = 'https://win.rustup.rs/aarch64'; Action = { - Invoke-WebRequest -Uri 'https://win.rustup.rs/aarch64' -OutFile '${{github.workspace}}\rustup-init.exe'; - & '${{github.workspace}}\rustup-init.exe' --default-host aarch64-pc-windows-msvc --default-toolchain nightly -y - }}, - @{ Name = 'LLVM 19.1.5'; Url = $null; Action = { & '${{github.workspace}}\LLVM-19.1.5-woa64.exe' /S }}, - @{ Name = 'Git 2.48.0-rc1'; Url = $null; Action = { & '${{github.workspace}}\Git-2.48.0-rc1-arm64.exe' /VERYSILENT }} + @{ Name = 'Visual Studio 2022 Build Tools (aarch64)'; Action = { choco install visualstudio2022buildtools -y --no-progress --silent --package-parameters '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.Windows11SDK.22621' }}, + @{ Name = 'Rust (nightly, aarch64)'; Url = 'https://win.rustup.rs/aarch64'; Action = { & '${{github.workspace}}\rustup-init.exe' --default-host aarch64-pc-windows-msvc --default-toolchain nightly -y }}, + @{ Name = 'LLVM 19.1.5'; Action = { & '${{github.workspace}}\LLVM-19.1.5-woa64.exe' /S }}, + @{ Name = 'Git 2.48.0-rc1'; Action = { & '${{github.workspace}}\Git-2.48.0-rc1-arm64.exe' /VERYSILENT }} ) $installs | ForEach-Object { @@ -127,8 +122,7 @@ jobs: $output = Get-ChildItem -Path "target/${{ matrix.target }}/release/build/**/$($arch)_bindgen.rs" -Recurse | Select-Object -First 1 Copy-Item -Path $output.FullName -Destination "src/ffi/$($arch)_bindgen.rs" - - Write-Host "Moved $output to src/ffi/$($arch)_bindgen.rs" + Log "Moved $output to src/ffi/$($arch)_bindgen.rs" - name: Upload generated file as artifact uses: actions/upload-artifact@v4