From 6c5cc37c195b425d97a335b42c13f1c01e9c0129 Mon Sep 17 00:00:00 2001 From: oberrich Date: Fri, 10 Jan 2025 08:22:13 +0100 Subject: [PATCH] chore: simplify ci --- .github/workflows/rust.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7d105d4..fbf52a9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -46,21 +46,21 @@ jobs: $installs = @( @{ Name = 'Chocolatey'; Url = 'https://chocolatey.org/install.ps1'; Hash = $null; - Action = { & "${{github.workspace}}\install.ps1" }}, + Action = { & 'install.ps1' }}, @{ Name = 'Visual Studio 2022 Build Tools (aarch64)'; Hash = $null; Url = $null; 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://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe'; Hash = 'https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe.sha256'; - Action = { & '${{github.workspace}}\rustup-init.exe' --default-host aarch64-pc-windows-msvc --default-toolchain nightly -y }}, + Action = { & 'rustup-init.exe' --default-host aarch64-pc-windows-msvc --default-toolchain nightly -y }}, @{ Name = 'LLVM 19.1.5'; Url = 'https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.5/LLVM-19.1.5-woa64.exe'; Hash = '63D479C19C3908F8C973331EDC9B576485EAB6AB0809F58C79DF5D209FDD8F96'; - Action = { & '${{github.workspace}}\LLVM-19.1.5-woa64.exe' /S }}, + Action = { & 'LLVM-19.1.5-woa64.exe' /S }}, @{ Name = 'Git 2.48.0-rc1'; Url = 'https://github.com/git-for-windows/git/releases/download/v2.48.0-rc2.windows.1/Git-2.48.0-rc2-arm64.exe'; Hash = '712739bb49832d571732e3e74b111d7cb4a63cd622ef3e87d01efe35046d9a4f'; - Action = { & '${{github.workspace}}\Git-2.48.0-rc2-arm64.exe' /VERYSILENT }} + Action = { & 'Git-2.48.0-rc2-arm64.exe' /VERYSILENT }} ) $installs | ForEach-Object { @@ -95,18 +95,18 @@ jobs: & $_.Action > $null 2>&1 Log "$($_.Name) installation completed." } catch { - Log "Failed to install $($_.Name)." "ERROR" + Log "Failed to install $($_.Name)." -Level "ERROR" } } - $exports = @( + $paths = @( "$env:ProgramFiles\Git\cmd", # Git "$env:ProgramFiles\Git\bin", # Bash "$env:ProgramData\chocolatey\bin", # Chocolatey "$env:USERPROFILE\.cargo\bin" # Rust ) - $exports | ForEach-Object { + $paths | ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ Log "Added $_ to `$GITHUB_PATH" }