Skip to content

Commit

Permalink
Merge branch 'clshortfuse:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
marat569 authored Nov 22, 2024
2 parents 1cdc5f8 + c76c59e commit 980deaa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/cmake-ninja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ jobs:
- uses: actions/[email protected]
with:
submodules: recursive
- uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 22621

- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v5
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/cmake-visual-studio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ jobs:
with:
submodules: recursive

- uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 22621

- name: Configure CMake (x64)
run: >
cmake
-DCMAKE_SYSTEM_VERSION=10.0.22621.0
-DCMAKE_SYSTEM_VERSION=10.0.26100.0
-B build
-S .
-G "Visual Studio 17 2022" -T host=x86 -A x64
Expand All @@ -39,7 +35,7 @@ jobs:
- name: Configure CMake (x32)
run: >
cmake
-DCMAKE_SYSTEM_VERSION=10.0.22621.0
-DCMAKE_SYSTEM_VERSION=10.0.26100.0
-B build32
-S .
-G "Visual Studio 17 2022" -T host=x86 -A Win32
Expand Down

0 comments on commit 980deaa

Please sign in to comment.