Try and fix the rest of circleci for vulkan.

This commit is contained in:
Adam Treat 2023-08-31 14:37:57 -04:00
parent 85e34598f9
commit b9fd0c25b2

View File

@ -94,12 +94,18 @@ jobs:
key: windows-qt-cache key: windows-qt-cache
paths: paths:
- C:\Qt - C:\Qt
- run:
name: Install VulkanSDK
command: |
Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/1.3.261.1/windows/VulkanSDK-1.3.261.1-Installer.exe -OutFile VulkanSDK-1.3.261.1-Installer.exe
.\VulkanSDK-1.3.261.1-Installer.exe --accept-licenses --default-answer --confirm-command install
- run: - run:
name: Build name: Build
command: | command: |
$Env:PATH = "${Env:PATH};C:\Program Files (x86)\Windows Kits\10\bin\x64" $Env:PATH = "${Env:PATH};C:\Program Files (x86)\Windows Kits\10\bin\x64"
$Env:PATH = "${Env:PATH};C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" $Env:PATH = "${Env:PATH};C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64"
$Env:PATH = "${Env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64" $Env:PATH = "${Env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64"
$Env:PATH = "${Env:PATH};C:\VulkanSDK\1.3.261.1\bin"
$Env:LIB = "${Env:LIB};C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22000.0\ucrt\x64" $Env:LIB = "${Env:LIB};C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22000.0\ucrt\x64"
$Env:LIB = "${Env:LIB};C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22000.0\um\x64" $Env:LIB = "${Env:LIB};C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22000.0\um\x64"
$Env:LIB = "${Env:LIB};C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\lib\x64" $Env:LIB = "${Env:LIB};C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\lib\x64"
@ -423,6 +429,11 @@ jobs:
- run: - run:
name: Install MinGW64 name: Install MinGW64
command: choco install -y mingw --force --no-progress command: choco install -y mingw --force --no-progress
- run:
name: Install VulkanSDK
command: |
Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/1.3.261.1/windows/VulkanSDK-1.3.261.1-Installer.exe -OutFile VulkanSDK-1.3.261.1-Installer.exe
.\VulkanSDK-1.3.261.1-Installer.exe --accept-licenses --default-answer --confirm-command install
- run: - run:
name: Install dependencies name: Install dependencies
command: | command: |
@ -433,6 +444,7 @@ jobs:
$MinGWBin = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin" $MinGWBin = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin"
$Env:Path += ";$MinGwBin" $Env:Path += ";$MinGwBin"
$Env:Path += ";C:\Program Files\CMake\bin" $Env:Path += ";C:\Program Files\CMake\bin"
$Env:Path += ";C:\VulkanSDK\1.3.261.1\bin"
cd gpt4all-backend cd gpt4all-backend
mkdir runtimes/win-x64 mkdir runtimes/win-x64
cd runtimes/win-x64 cd runtimes/win-x64
@ -459,6 +471,11 @@ jobs:
command: | command: |
git submodule sync git submodule sync
git submodule update --init --recursive git submodule update --init --recursive
- run:
name: Install VulkanSDK
command: |
Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/1.3.261.1/windows/VulkanSDK-1.3.261.1-Installer.exe -OutFile VulkanSDK-1.3.261.1-Installer.exe
.\VulkanSDK-1.3.261.1-Installer.exe --accept-licenses --default-answer --confirm-command install
- run: - run:
name: Install dependencies name: Install dependencies
command: | command: |
@ -467,6 +484,7 @@ jobs:
name: Build Libraries name: Build Libraries
command: | command: |
$Env:Path += ";C:\Program Files\CMake\bin" $Env:Path += ";C:\Program Files\CMake\bin"
$Env:Path += ";C:\VulkanSDK\1.3.261.1\bin"
cd gpt4all-backend cd gpt4all-backend
mkdir runtimes/win-x64_msvc mkdir runtimes/win-x64_msvc
cd runtimes/win-x64_msvc cd runtimes/win-x64_msvc