From f84f702ebdb83dbdf9506973a35e59cb3f8d2598 Mon Sep 17 00:00:00 2001 From: Pascal Thomet Date: Thu, 1 Feb 2024 19:54:17 +0100 Subject: [PATCH] Debug CI --- .github/workflows/VcpkgDeps.yml | 1 + .github/workflows/{ => t}/Android.yml | 0 .github/workflows/{ => t}/Automate.yml | 0 .github/workflows/{ => t}/DirectX.yml | 0 .github/workflows/{ => t}/Emscripten.yml | 0 .github/workflows/{ => t}/Metal.yml | 0 .github/workflows/{ => t}/MinGW.yml | 0 .github/workflows/{ => t}/StarterTemplate.yml | 0 .github/workflows/{ => t}/TestEngine.yml | 0 .github/workflows/{ => t}/Tips.md | 0 .github/workflows/{ => t}/VcpkgPackage.yml | 0 .github/workflows/{ => t}/Vulkan.yml | 0 .github/workflows/{ => t}/Win_Mac_Linux.yml | 0 .github/workflows/{ => t}/iOS.yml | 0 CMakePresets.json | 8 ++++---- 15 files changed, 5 insertions(+), 4 deletions(-) rename .github/workflows/{ => t}/Android.yml (100%) rename .github/workflows/{ => t}/Automate.yml (100%) rename .github/workflows/{ => t}/DirectX.yml (100%) rename .github/workflows/{ => t}/Emscripten.yml (100%) rename .github/workflows/{ => t}/Metal.yml (100%) rename .github/workflows/{ => t}/MinGW.yml (100%) rename .github/workflows/{ => t}/StarterTemplate.yml (100%) rename .github/workflows/{ => t}/TestEngine.yml (100%) rename .github/workflows/{ => t}/Tips.md (100%) rename .github/workflows/{ => t}/VcpkgPackage.yml (100%) rename .github/workflows/{ => t}/Vulkan.yml (100%) rename .github/workflows/{ => t}/Win_Mac_Linux.yml (100%) rename .github/workflows/{ => t}/iOS.yml (100%) diff --git a/.github/workflows/VcpkgDeps.yml b/.github/workflows/VcpkgDeps.yml index 9b821b81..6bfb1781 100644 --- 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 b/.github/workflows/t/Android.yml similarity index 100% rename from .github/workflows/Android.yml rename to .github/workflows/t/Android.yml diff --git a/.github/workflows/Automate.yml b/.github/workflows/t/Automate.yml similarity index 100% rename from .github/workflows/Automate.yml rename to .github/workflows/t/Automate.yml diff --git a/.github/workflows/DirectX.yml b/.github/workflows/t/DirectX.yml similarity index 100% rename from .github/workflows/DirectX.yml rename to .github/workflows/t/DirectX.yml diff --git a/.github/workflows/Emscripten.yml b/.github/workflows/t/Emscripten.yml similarity index 100% rename from .github/workflows/Emscripten.yml rename to .github/workflows/t/Emscripten.yml diff --git a/.github/workflows/Metal.yml b/.github/workflows/t/Metal.yml similarity index 100% rename from .github/workflows/Metal.yml rename to .github/workflows/t/Metal.yml diff --git a/.github/workflows/MinGW.yml b/.github/workflows/t/MinGW.yml similarity index 100% rename from .github/workflows/MinGW.yml rename to .github/workflows/t/MinGW.yml diff --git a/.github/workflows/StarterTemplate.yml b/.github/workflows/t/StarterTemplate.yml similarity index 100% rename from .github/workflows/StarterTemplate.yml rename to .github/workflows/t/StarterTemplate.yml diff --git a/.github/workflows/TestEngine.yml b/.github/workflows/t/TestEngine.yml similarity index 100% rename from .github/workflows/TestEngine.yml rename to .github/workflows/t/TestEngine.yml diff --git a/.github/workflows/Tips.md b/.github/workflows/t/Tips.md similarity index 100% rename from .github/workflows/Tips.md rename to .github/workflows/t/Tips.md diff --git a/.github/workflows/VcpkgPackage.yml b/.github/workflows/t/VcpkgPackage.yml similarity index 100% rename from .github/workflows/VcpkgPackage.yml rename to .github/workflows/t/VcpkgPackage.yml diff --git a/.github/workflows/Vulkan.yml b/.github/workflows/t/Vulkan.yml similarity index 100% rename from .github/workflows/Vulkan.yml rename to .github/workflows/t/Vulkan.yml diff --git a/.github/workflows/Win_Mac_Linux.yml b/.github/workflows/t/Win_Mac_Linux.yml similarity index 100% rename from .github/workflows/Win_Mac_Linux.yml rename to .github/workflows/t/Win_Mac_Linux.yml diff --git a/.github/workflows/iOS.yml b/.github/workflows/t/iOS.yml similarity index 100% rename from .github/workflows/iOS.yml rename to .github/workflows/t/iOS.yml diff --git a/CMakePresets.json b/CMakePresets.json index bf0e7b25..c80b2532 100644 --- 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"