Debug CI

pthom · Feb 1, 2024 · f84f702 · f84f702
1 parent 6169e49
commit f84f702
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/VcpkgDeps.yml b/.github/workflows/VcpkgDeps.yml
@@ -55,6 +55,7 @@ jobs:
         # This will read the dependencies from the vcpkg.json file,
         # and the CMake preset from CMakePresets.json
         run: |
+          export VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT
           mkdir build
           cd build
           cmake .. --preset build_vcpkg_default -DCMAKE_BUILD_TYPE=Release

diff --git a/.github/workflows/Android.yml → .github/workflows/t/Android.yml b/.github/workflows/Android.yml → .github/workflows/t/Android.yml
diff --git a/.github/workflows/Automate.yml → .github/workflows/t/Automate.yml b/.github/workflows/Automate.yml → .github/workflows/t/Automate.yml
diff --git a/.github/workflows/DirectX.yml → .github/workflows/t/DirectX.yml b/.github/workflows/DirectX.yml → .github/workflows/t/DirectX.yml
diff --git a/.github/workflows/Emscripten.yml → .github/workflows/t/Emscripten.yml b/.github/workflows/Emscripten.yml → .github/workflows/t/Emscripten.yml
diff --git a/.github/workflows/Metal.yml → .github/workflows/t/Metal.yml b/.github/workflows/Metal.yml → .github/workflows/t/Metal.yml
diff --git a/.github/workflows/MinGW.yml → .github/workflows/t/MinGW.yml b/.github/workflows/MinGW.yml → .github/workflows/t/MinGW.yml
diff --git a/.github/workflows/StarterTemplate.yml → .github/workflows/t/StarterTemplate.yml b/.github/workflows/StarterTemplate.yml → .github/workflows/t/StarterTemplate.yml
diff --git a/.github/workflows/TestEngine.yml → .github/workflows/t/TestEngine.yml b/.github/workflows/TestEngine.yml → .github/workflows/t/TestEngine.yml
diff --git a/.github/workflows/Tips.md → .github/workflows/t/Tips.md b/.github/workflows/Tips.md → .github/workflows/t/Tips.md
diff --git a/.github/workflows/VcpkgPackage.yml → .github/workflows/t/VcpkgPackage.yml b/.github/workflows/VcpkgPackage.yml → .github/workflows/t/VcpkgPackage.yml
diff --git a/.github/workflows/Vulkan.yml → .github/workflows/t/Vulkan.yml b/.github/workflows/Vulkan.yml → .github/workflows/t/Vulkan.yml
diff --git a/.github/workflows/Win_Mac_Linux.yml → .github/workflows/t/Win_Mac_Linux.yml b/.github/workflows/Win_Mac_Linux.yml → .github/workflows/t/Win_Mac_Linux.yml
diff --git a/.github/workflows/iOS.yml → .github/workflows/t/iOS.yml b/.github/workflows/iOS.yml → .github/workflows/t/iOS.yml
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -5,7 +5,7 @@
       "name": "build_vcpkg_default",
       "description": "Build with vcpkg default settings (opengl3 + sdl and glfw). You need to create a build directory and run from it",
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
         "HELLOIMGUI_USE_GLFW_OPENGL3": "ON",
         "HELLOIMGUI_USE_SDL_OPENGL3": "ON",
         "HELLOIMGUI_USE_IMGUI_CMAKE_PACKAGE": "ON"
@@ -16,7 +16,7 @@
       "description": "Build with vcpkg default settings (opengl3 + sdl and glfw). Will build inside build_use_vcpkg_opengl3/",
       "binaryDir": "${sourceDir}/build_use_vcpkg_opengl3",
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
         "HELLOIMGUI_USE_GLFW_OPENGL3": "ON",
         "HELLOIMGUI_USE_SDL_OPENGL3": "ON",
         "HELLOIMGUI_USE_IMGUI_CMAKE_PACKAGE": "ON"
@@ -27,7 +27,7 @@
       "description": "Build with vcpkg (for metal + sdl and glfw). Will build inside build_use_vcpkg_metal/",
       "binaryDir": "${sourceDir}/build_use_vcpkg_metal",
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
         "HELLOIMGUI_USE_GLFW_METAL": "ON",
         "HELLOIMGUI_USE_SDL_METAL": "ON",
         "HELLOIMGUI_USE_IMGUI_CMAKE_PACKAGE": "ON"
@@ -38,7 +38,7 @@
       "description": "Build with vcpkg (for vulkan + sdl and glfw). Will build inside build_use_vcpkg_vulkan/",
       "binaryDir": "${sourceDir}/build_use_vcpkg_vulkan",
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
         "HELLOIMGUI_USE_GLFW_VULKAN": "ON",
         "HELLOIMGUI_USE_SDL_VULKAN": "ON",
         "HELLOIMGUI_USE_IMGUI_CMAKE_PACKAGE": "ON"