Skip to content

Commit 9f38783

Browse files
refactor: main CI workflow (#45)
The previous config seemed to use an older version of both MSVC and clang-cl which caused failures on including new headers like `<stdfloat>`--this avoids the errors as it uses newer versions of the toolsets. Also bumped versions for actions. Tested for release builds with MSVC/Ninja and clang-cl/Ninja
1 parent bada881 commit 9f38783

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

.github/workflows/main_ci.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
VCPKG_COMMIT_ID: 095ee8757ec933b22d445738d2dbb1ce89bb8021
11+
VCPKG_COMMIT_ID: e44d60e6bf0964064bf69667cd9f3e91dc383c7c
12+
GITHUB_WORKSPACE: ${{ github.workspace }}
1213

1314
jobs:
1415
build:
@@ -23,21 +24,19 @@ jobs:
2324
- name: Checkout
2425
uses: actions/checkout@v4
2526

26-
- name: Setup MSVC Environment
27-
uses: ilammy/[email protected]
27+
- name: Get CMake
28+
uses: lukka/get-cmake@latest
2829

2930
- name: Setup vcpkg
30-
uses: lukka/run-vcpkg@v11
31+
uses: lukka/run-vcpkg@v11.1
3132
with:
3233
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
3334

34-
- name: Setup cmake
35-
uses: jwlawson/actions-setup-cmake@v1.14
35+
- name: Run CMake
36+
uses: lukka/run-cmake@v10.6
3637
with:
37-
cmake-version: "3.26"
38-
39-
- name: Generate
40-
run: cmake -B "${{ github.workspace }}/build" -S "${{ github.workspace }}/CommonLibSF" --preset=build-release-${{ matrix.compiler }}-ninja
41-
42-
- name: Build
43-
run: cmake --build "${{ github.workspace }}/build"
38+
cmakeListsTxtPath: "${{ github.workspace }}/CommonLibSF/CMakeLists.txt"
39+
configurePreset: build-release-${{ matrix.compiler }}-ninja
40+
configurePresetCmdString: "[`-B`, `$[env.GITHUB_WORKSPACE]/build`, `-S`, `$[env.GITHUB_WORKSPACE]/CommonLibSF`, `--preset`, `$[env.CONFIGURE_PRESET_NAME]`]"
41+
buildPreset: release-${{ matrix.compiler }}-ninja
42+
buildPresetCmdString: "[`--build`, `$[env.GITHUB_WORKSPACE]/build`, `--preset`, `$[env.BUILD_PRESET_NAME]`]"

0 commit comments

Comments
 (0)