16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-09-01 06:59:18 +02:00

Update CI configuration for Windows and Linux builds

This commit is contained in:
2026-08-19 14:23:40 +02:00
committed by GitHub
parent 1cfe44a9d3
commit 6b50a6aa68

View File

@@ -17,7 +17,8 @@ permissions:
contents: read contents: read
env: env:
CONFIG: RelWithDebInfo CONFIG_WIN: RelWithDebInfo
CONFIG_LINUX: Release
jobs: jobs:
@@ -83,13 +84,13 @@ jobs:
shell: pwsh shell: pwsh
run: | run: |
cmake --build build ` cmake --build build `
--config $env:CONFIG ` --config $env:CONFIG_WIN `
--parallel --parallel
- name: Copy shaders - name: Copy shaders
shell: pwsh shell: pwsh
run: | run: |
$output = "build/bin/$env:CONFIG" $output = "build/bin/$env:CONFIG_WIN"
New-Item ` New-Item `
-ItemType Directory ` -ItemType Directory `
@@ -105,19 +106,19 @@ jobs:
- name: Upload Windows build - name: Upload Windows build
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: maszyna-windows-x64-${{ env.CONFIG }} name: maszyna-windows-x64-${{ env.CONFIG_WIN }}
path: | path: |
build/bin/${{ env.CONFIG }}/ build/bin/${{ env.CONFIG_WIN }}/
if-no-files-found: error if-no-files-found: error
retention-days: 14 retention-days: 14
- name: Upload Windows debug symbols - name: Upload Windows debug symbols
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: maszyna-windows-x64-symbols-${{ env.CONFIG }} name: maszyna-windows-x64-symbols-${{ env.CONFIG_WIN }}
path: | path: |
build/pdb/${{ env.CONFIG }}/*.pdb build/pdb/${{ env.CONFIG_WIN }}/*.pdb
build/bin/${{ env.CONFIG }}/*.map build/bin/${{ env.CONFIG_WIN }}/*.map
if-no-files-found: warn if-no-files-found: warn
retention-days: 14 retention-days: 14
@@ -190,20 +191,6 @@ jobs:
sudo ldconfig sudo ldconfig
#
# This workaround already exists in the current GitHub CI.
# GCC doesn't like this GLM function in its current form.
#
- name: Patch GLM for GCC
run: |
sed -i \
's/GLM_FUNC_QUALIFIER std::string format(const char\* message, \.\.\.)/inline std::string format(const char* message, ...)/' \
ref/glm/glm/gtx/string_cast.inl
grep -n \
"std::string format(const char\* message" \
ref/glm/glm/gtx/string_cast.inl
- name: Show environment - name: Show environment
run: | run: |
gcc --version gcc --version
@@ -216,7 +203,7 @@ jobs:
cmake \ cmake \
-S . \ -S . \
-B build \ -B build \
-DCMAKE_BUILD_TYPE="${CONFIG}" \ -DCMAKE_BUILD_TYPE="${CONFIG_LINUX}" \
-DWITH_BETTER_RENDERER=OFF \ -DWITH_BETTER_RENDERER=OFF \
-DWITH_ZMQ=OFF \ -DWITH_ZMQ=OFF \
-DWITH_OPENVR=OFF \ -DWITH_OPENVR=OFF \
@@ -259,7 +246,7 @@ jobs:
- name: Upload Linux build - name: Upload Linux build
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: maszyna-linux-x64-${{ env.CONFIG }} name: maszyna-linux-x64-${{ env.CONFIG_LINUX }}
path: | path: |
build/bin/ build/bin/
if-no-files-found: error if-no-files-found: error