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 Dec 20, 2024
2 parents cb05c42 + 332e897 commit 402a0ec
Show file tree
Hide file tree
Showing 45 changed files with 8,476 additions and 1,575 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/cmake-ninja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
- name: Build (x64)
run: cmake --build --preset ninja-x64-release --verbose

- name: Build RelWithDebInfo (x64)
run: cmake --build --preset ninja-x64-relwithdebinfo --verbose

- name: Configure build for x86
uses: ilammy/msvc-dev-cmd@v1
with:
Expand All @@ -40,6 +43,9 @@ jobs:
- name: Build (x86)
run: cmake --build --preset ninja-x86-release --verbose

- name: Build RelWithDebInfo (x86)
run: cmake --build --preset ninja-x86-relwithdebinfo --verbose

- name: Prepare Web Listing
run: md www

Expand All @@ -52,6 +58,15 @@ jobs:
- name: Copy Binaries (Tools)
run: copy build\Release\*.exe www\

- name: Prepare Debug Web Listing
run: md www\debug

- name: Copy RelWithDebInfo Binaries (x64)
run: copy build\RelWithDebInfo\*.addon64 www\debug\

- name: Copy RelWithDebInfo Binaries (x86)
run: copy build32\RelWithDebInfo\*.addon32 www\debug\

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"configuration": "Release"
},
{
"name": "ninja-x64-RelWithDebInfo",
"name": "ninja-x64-relwithdebinfo",
"displayName": "Ninja x64 RelWithDebInfo",
"configurePreset": "ninja-x64",
"configuration": "RelWithDebInfo"
Expand All @@ -133,7 +133,7 @@
"configuration": "Release"
},
{
"name": "ninja-x86-RelWithDebInfo",
"name": "ninja-x86-relwithdebinfo",
"displayName": "Ninja x86 RelWithDebInfo",
"configurePreset": "ninja-x86",
"configuration": "RelWithDebInfo"
Expand All @@ -151,7 +151,7 @@
"configuration": "Release"
},
{
"name": "vs-x64-RelWithDebInfo",
"name": "vs-x64-relwithdebinfo",
"displayName": "Visual Studio x64 RelWithDebInfo",
"configurePreset": "vs-x64",
"configuration": "RelWithDebInfo"
Expand All @@ -169,7 +169,7 @@
"configuration": "Release"
},
{
"name": "vs-x86-RelWithDebInfo",
"name": "vs-x86-relwithdebinfo",
"displayName": "Visual Studio x86 RelWithDebInfo",
"configurePreset": "vs-x64",
"configuration": "RelWithDebInfo"
Expand Down
Loading

0 comments on commit 402a0ec

Please sign in to comment.