ci: fix rust and wix pathing in windows runner
Build and Release Windows Client / build (push) Failing after 12s
Build and Release Windows Client / build (push) Failing after 12s
This commit is contained in:
1 parent
50f2774ffb
commit
01ed5a3924
1 file changed
+9
-6
@@ -16,11 +16,13 @@ jobs:
|
|||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
# Install rustup using the official Windows installer
|
$installDir = "$env:USERPROFILE\.cargo\bin"
|
||||||
|
if (-not (Test-Path $installDir)) {
|
||||||
Invoke-WebRequest -Uri "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -OutFile "rustup-init.exe"
|
Invoke-WebRequest -Uri "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -OutFile "rustup-init.exe"
|
||||||
.\rustup-init.exe -y --default-toolchain stable
|
.\rustup-init.exe -y --default-toolchain stable
|
||||||
# Add cargo to PATH for the rest of the session
|
}
|
||||||
echo "$HOME\.cargo\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
|
# Append to GITHUB_PATH for subsequent steps
|
||||||
|
Add-Content -Path $env:GITHUB_PATH -Value $installDir
|
||||||
|
|
||||||
- name: Install LLVM
|
- name: Install LLVM
|
||||||
run: choco install llvm --no-progress
|
run: choco install llvm --no-progress
|
||||||
@@ -28,6 +30,8 @@ jobs:
|
|||||||
- name: Build Client
|
- name: Build Client
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
|
# Manually ensure cargo is in path for this specific shell session
|
||||||
|
$env:Path = "$env:USERPROFILE\.cargo\bin;" + $env:Path
|
||||||
cd client
|
cd client
|
||||||
cargo build --release
|
cargo build --release
|
||||||
|
|
||||||
@@ -36,7 +40,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
New-Item -ItemType Directory -Force -Path bin
|
New-Item -ItemType Directory -Force -Path bin
|
||||||
Copy-Item "client\target\release\meshvpn-client.exe" "bin\client.exe"
|
Copy-Item "client\target\release\meshvpn-client.exe" "bin\client.exe"
|
||||||
# Download Wintun.dll as it is a driver binary not stored in git
|
|
||||||
Invoke-WebRequest -Uri "https://github.com/WireGuard/wintun/releases/latest/download/wintun.dll" -OutFile "bin\wintun.dll"
|
Invoke-WebRequest -Uri "https://github.com/WireGuard/wintun/releases/latest/download/wintun.dll" -OutFile "bin\wintun.dll"
|
||||||
|
|
||||||
- name: Install WiX Toolset
|
- name: Install WiX Toolset
|
||||||
@@ -45,8 +48,8 @@ jobs:
|
|||||||
- name: Build MSI Installer
|
- name: Build MSI Installer
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
# candle.exe compiles .wxs to .wixobj
|
# Add WiX bin to path (common choco install path)
|
||||||
# light.exe links .wixobj to .msi
|
$env:Path += ";C:\Program Files (x86)\WiX Toolset v3\bin"
|
||||||
candle.exe installer\product.wxs -o installer\product.wixobj
|
candle.exe installer\product.wxs -o installer\product.wixobj
|
||||||
light.exe installer\product.wixobj -o meshvpn-client.msi
|
light.exe installer\product.wixobj -o meshvpn-client.msi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user