Changed linux CI scripts naming.

stripe2933 · Sep 30, 2024 · 90edf66 · 90edf66
1 parent 2211733
commit 90edf66
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -27,8 +27,7 @@ jobs:
           vulkan-use-cache: true
 
       - name: Install Ninja and build dependencies
-        run: |
-          sudo apt-get install ninja-build xorg-dev libc++-dev libc++abi-dev
+        run: sudo apt-get install ninja-build xorg-dev libc++-dev libc++abi-dev
 
       - name: Install vcpkg
         run: |

diff --git a/.github/workflows/scripts/CMakeUserPresets.json b/.github/workflows/scripts/CMakeUserPresets.json
@@ -6,7 +6,6 @@
       "displayName": "Linux + Clang 18",
       "inherits": "default",
       "cacheVariables": {
-        "CMAKE_C_COMPILER": "/usr/bin/clang-18",
         "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18",
         "CMAKE_CXX_FLAGS": "-stdlib=libc++",
         "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++ -lc++abi",

diff --git a/.github/workflows/scripts/triplets/x64-linux-clang.cmake b/.github/workflows/scripts/triplets/x64-linux-clang.cmake
@@ -2,4 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../clang-toolchain.cmake)
+set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../x64-linux-clang-toolchain.cmake)
diff --git a/...b/workflows/scripts/clang-toolchain.cmake → ...s/scripts/x64-linux-clang-toolchain.cmake b/...b/workflows/scripts/clang-toolchain.cmake → ...s/scripts/x64-linux-clang-toolchain.cmake