From d2cf852eb2a88d90d10c00a01c552a9e20c30c70 Mon Sep 17 00:00:00 2001 From: Aiden Date: Wed, 6 May 2026 12:15:34 +1000 Subject: [PATCH] Update ci.yml --- .gitea/workflows/ci.yml | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index df7469e..ee07ba3 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -12,13 +12,13 @@ on: jobs: native-windows: name: Native Windows Build And Tests - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Checkout uses: actions/checkout@v4 - - name: Resolve Native Third Party Dependencies + - name: Configure Debug shell: powershell run: | $gpudirectDir = "${{ vars.GPUDIRECT_DIR }}" @@ -53,14 +53,9 @@ jobs: exit 1 } - "GPUDIRECT_DIR=$gpudirectDir" | Out-File -FilePath $env:GITHUB_ENV -Append - "SLANG_ROOT=$slangRoot" | Out-File -FilePath $env:GITHUB_ENV -Append Write-Host "Using GPUDIRECT_DIR=$gpudirectDir" Write-Host "Using SLANG_ROOT=$slangRoot" - - - name: Configure Debug - shell: powershell - run: cmake --preset vs2022-x64-debug -DGPUDIRECT_DIR="$env:GPUDIRECT_DIR" -DSLANG_ROOT="$env:SLANG_ROOT" + cmake --preset vs2022-x64-debug -DGPUDIRECT_DIR="$gpudirectDir" -DSLANG_ROOT="$slangRoot" - name: Build Debug shell: powershell @@ -88,7 +83,7 @@ jobs: package-windows: name: Windows Release Package - runs-on: windows-latest + runs-on: windows-2022 needs: - native-windows - ui-ubuntu @@ -97,7 +92,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Resolve Native Third Party Dependencies + - name: Build UI + shell: powershell + working-directory: ui + run: | + npm ci --no-audit --no-fund + npm run build + + - name: Configure Release shell: powershell run: | $gpudirectDir = "${{ vars.GPUDIRECT_DIR }}" @@ -132,21 +134,9 @@ jobs: exit 1 } - "GPUDIRECT_DIR=$gpudirectDir" | Out-File -FilePath $env:GITHUB_ENV -Append - "SLANG_ROOT=$slangRoot" | Out-File -FilePath $env:GITHUB_ENV -Append Write-Host "Using GPUDIRECT_DIR=$gpudirectDir" Write-Host "Using SLANG_ROOT=$slangRoot" - - - name: Build UI - shell: powershell - working-directory: ui - run: | - npm ci --no-audit --no-fund - npm run build - - - name: Configure Release - shell: powershell - run: cmake --preset vs2022-x64-release -DGPUDIRECT_DIR="$env:GPUDIRECT_DIR" -DSLANG_ROOT="$env:SLANG_ROOT" + cmake --preset vs2022-x64-release -DGPUDIRECT_DIR="$gpudirectDir" -DSLANG_ROOT="$slangRoot" - name: Build Release shell: powershell