Update ci.yml
This commit is contained in:
@@ -12,13 +12,13 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
native-windows:
|
native-windows:
|
||||||
name: Native Windows Build And Tests
|
name: Native Windows Build And Tests
|
||||||
runs-on: windows-latest
|
runs-on: windows-2022
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Resolve Native Third Party Dependencies
|
- name: Configure Debug
|
||||||
shell: powershell
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
$gpudirectDir = "${{ vars.GPUDIRECT_DIR }}"
|
$gpudirectDir = "${{ vars.GPUDIRECT_DIR }}"
|
||||||
@@ -53,14 +53,9 @@ jobs:
|
|||||||
exit 1
|
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 GPUDIRECT_DIR=$gpudirectDir"
|
||||||
Write-Host "Using SLANG_ROOT=$slangRoot"
|
Write-Host "Using SLANG_ROOT=$slangRoot"
|
||||||
|
cmake --preset vs2022-x64-debug -DGPUDIRECT_DIR="$gpudirectDir" -DSLANG_ROOT="$slangRoot"
|
||||||
- name: Configure Debug
|
|
||||||
shell: powershell
|
|
||||||
run: cmake --preset vs2022-x64-debug -DGPUDIRECT_DIR="$env:GPUDIRECT_DIR" -DSLANG_ROOT="$env:SLANG_ROOT"
|
|
||||||
|
|
||||||
- name: Build Debug
|
- name: Build Debug
|
||||||
shell: powershell
|
shell: powershell
|
||||||
@@ -88,7 +83,7 @@ jobs:
|
|||||||
|
|
||||||
package-windows:
|
package-windows:
|
||||||
name: Windows Release Package
|
name: Windows Release Package
|
||||||
runs-on: windows-latest
|
runs-on: windows-2022
|
||||||
needs:
|
needs:
|
||||||
- native-windows
|
- native-windows
|
||||||
- ui-ubuntu
|
- ui-ubuntu
|
||||||
@@ -97,7 +92,14 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
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
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
$gpudirectDir = "${{ vars.GPUDIRECT_DIR }}"
|
$gpudirectDir = "${{ vars.GPUDIRECT_DIR }}"
|
||||||
@@ -132,21 +134,9 @@ jobs:
|
|||||||
exit 1
|
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 GPUDIRECT_DIR=$gpudirectDir"
|
||||||
Write-Host "Using SLANG_ROOT=$slangRoot"
|
Write-Host "Using SLANG_ROOT=$slangRoot"
|
||||||
|
cmake --preset vs2022-x64-release -DGPUDIRECT_DIR="$gpudirectDir" -DSLANG_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"
|
|
||||||
|
|
||||||
- name: Build Release
|
- name: Build Release
|
||||||
shell: powershell
|
shell: powershell
|
||||||
|
|||||||
Reference in New Issue
Block a user