From d9bd60f473f390d6c2f0616765079453e36ce6fe Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 7 Dec 2024 02:45:51 +0300 Subject: [PATCH] update windows and macos workflows & add engine version to log --- .github/workflows/macos.yml | 28 ++++++++++++++++------------ .github/workflows/windows.yml | 24 +++++++++++++----------- src/engine.cpp | 1 + 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e4ddf55a..0d76f5f4 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -39,16 +39,20 @@ jobs: - name: Run tests run: ctest --output-on-failure --test-dir build - - name: Create DMG + - name: Run engine (headless) run: | - mkdir VoxelEngineDmgContent - cp -r build/res VoxelEngineDmgContent/ - cp -r build/VoxelEngine VoxelEngineDmgContent/ - cp -r build/libs VoxelEngineDmgContent/libs - hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO - - - name: Upload artifacts - uses: actions/upload-artifact@v4 - with: - name: VoxelEngineMacOs - path: VoxelEngineMacApp.dmg + chmod +x build/VoxelEngine + build/VoxelEngine --headless --dir userdir +# - name: Create DMG +# run: | +# mkdir VoxelEngineDmgContent +# cp -r build/res VoxelEngineDmgContent/ +# cp -r build/VoxelEngine VoxelEngineDmgContent/ +# cp -r build/libs VoxelEngineDmgContent/libs +# hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO +# +# - name: Upload artifacts +# uses: actions/upload-artifact@v4 +# with: +# name: VoxelEngineMacOs +# path: VoxelEngineMacApp.dmg diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b14c32d0..57338d34 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,16 +34,18 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVOXELENGINE_BUILD_TESTS=ON .. cmake --build . --config Release - - name: Package for Windows - run: | - mkdir packaged - cp -r build/* packaged/ - cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll - mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe - working-directory: ${{ github.workspace }} - name: Run tests run: ctest --output-on-failure --test-dir build - - uses: actions/upload-artifact@v4 - with: - name: Windows-Build - path: 'packaged/Release/*' + - name: Run engine (headless) + run: build/Release/VoxelEngine.exe --headless --dir userdir +# - name: Package for Windows +# run: | +# mkdir packaged +# cp -r build/* packaged/ +# cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll +# mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe +# working-directory: ${{ github.workspace }} +# - uses: actions/upload-artifact@v4 +# with: +# name: Windows-Build +# path: 'packaged/Release/*' diff --git a/src/engine.cpp b/src/engine.cpp index d7942072..422637b8 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -75,6 +75,7 @@ Engine::Engine(CoreParameters coreParameters) settingsHandler({settings}), interpreter(std::make_unique()), network(network::Network::create(settings.network)) { + logger.info() << "engine version: " << ENGINE_VERSION_STRING; if (params.headless) { logger.info() << "headless mode is enabled"; }