Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd5dbc6494 | ||
|
|
c58bb6cd2c | ||
|
|
f4c4fb21c0 | ||
|
|
c7f98a176f | ||
|
|
3da03fdd7f | ||
|
|
21874e98c2 | ||
|
|
70aa850999 | ||
|
|
b1837571cc | ||
|
|
51ff1868ac | ||
|
|
5507e17402 | ||
|
|
b68e5567b8 |
9
.github/workflows/appimage.yml
vendored
9
.github/workflows/appimage.yml
vendored
@ -14,6 +14,8 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-appimage:
|
build-appimage:
|
||||||
|
# Only run on GitHub, skip on Gitea
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@ -48,7 +50,8 @@ jobs:
|
|||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: ctest --test-dir build
|
run: ctest --test-dir build
|
||||||
- name: Run engine tests
|
- name: Run engine tests
|
||||||
timeout-minutes: 1
|
timeout-minutes: 3
|
||||||
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
chmod +x build/VoxelEngine
|
chmod +x build/VoxelEngine
|
||||||
chmod +x AppDir/usr/bin/vctest
|
chmod +x AppDir/usr/bin/vctest
|
||||||
@ -59,7 +62,7 @@ jobs:
|
|||||||
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
||||||
with:
|
with:
|
||||||
recipe: dev/AppImageBuilder.yml
|
recipe: dev/AppImageBuilder.yml
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: AppImage
|
name: AppImage
|
||||||
path: './*.AppImage*'
|
path: './*.AppImage*'
|
||||||
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -8,8 +8,10 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
# Only run on GitHub, skip on Gitea
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
name: Build
|
name: Build
|
||||||
uses: ./.github/workflows/cmake.yml
|
uses: ./.github/workflows/cmake.yml
|
||||||
with:
|
with:
|
||||||
build_type: Release
|
build_type: Release
|
||||||
run_tests: true
|
run_tests: true
|
||||||
8
.github/workflows/cmake.yml
vendored
8
.github/workflows/cmake.yml
vendored
@ -19,6 +19,8 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
# Only run on GitHub, skip on Gitea
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
|
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
|
||||||
# You can convert this to a matrix build if you need cross-platform coverage.
|
# You can convert this to a matrix build if you need cross-platform coverage.
|
||||||
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
|
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
|
||||||
@ -39,7 +41,7 @@ jobs:
|
|||||||
# make && make install INSTALL_INC=/usr/include/lua
|
# make && make install INSTALL_INC=/usr/include/lua
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y cmake build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
|
sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
|
||||||
# fix luajit paths
|
# fix luajit paths
|
||||||
sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a
|
sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a
|
||||||
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
||||||
@ -68,9 +70,9 @@ jobs:
|
|||||||
run: ctest --test-dir ${{github.workspace}}/build
|
run: ctest --test-dir ${{github.workspace}}/build
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
if: ${{ inputs.upload_artifacts }}
|
if: ${{ inputs.upload_artifacts }}
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: VoxelEngine
|
name: VoxelEngine
|
||||||
path: |
|
path: |
|
||||||
VoxelEngine
|
VoxelEngine
|
||||||
res/*
|
res/*
|
||||||
9
.github/workflows/macos.yml
vendored
9
.github/workflows/macos.yml
vendored
@ -14,6 +14,8 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-dmg:
|
build-dmg:
|
||||||
|
# Only run on GitHub, skip on Gitea
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -41,7 +43,8 @@ jobs:
|
|||||||
run: ctest --output-on-failure --test-dir build
|
run: ctest --output-on-failure --test-dir build
|
||||||
|
|
||||||
- name: Run engine tests
|
- name: Run engine tests
|
||||||
timeout-minutes: 1
|
timeout-minutes: 3
|
||||||
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
chmod +x build/VoxelEngine
|
chmod +x build/VoxelEngine
|
||||||
chmod +x AppDir/usr/bin/vctest
|
chmod +x AppDir/usr/bin/vctest
|
||||||
@ -55,7 +58,7 @@ jobs:
|
|||||||
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: VoxelEngineMacOs
|
name: VoxelEngineMacOs
|
||||||
path: VoxelEngineMacApp.dmg
|
path: VoxelEngineMacApp.dmg
|
||||||
58
.github/workflows/release.yml
vendored
58
.github/workflows/release.yml
vendored
@ -1,5 +1,4 @@
|
|||||||
name: Build and Release
|
name: Release
|
||||||
run-name: ${{ github.actor }} preparing release
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
@ -14,7 +13,31 @@ env:
|
|||||||
RELEASE_VERSION: ${{ github.event.inputs.version || github.ref_name || 'testrelease' }}
|
RELEASE_VERSION: ${{ github.event.inputs.version || github.ref_name || 'testrelease' }}
|
||||||
BRANCH_NAME: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}
|
BRANCH_NAME: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}
|
||||||
jobs:
|
jobs:
|
||||||
|
# Gitea job - create draft release on tag push
|
||||||
|
gitea-draft-release:
|
||||||
|
if: github.server_url != 'https://github.com'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Create Draft Release on Gitea
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
|
tag_name: ${{ github.ref_name }}
|
||||||
|
name: VoxelCore ${{ github.ref_name }}
|
||||||
|
draft: true
|
||||||
|
body: |
|
||||||
|
## VoxelCore Release ${{ github.ref_name }}
|
||||||
|
|
||||||
|
### Downloads
|
||||||
|
Артефакты будут загружены вручную после сборки на GitHub.
|
||||||
|
|
||||||
|
---
|
||||||
|
**Full Changelog**: https://git.pyserve.org/PulseStudio/VoxelEngine/commits/tag/${{ github.ref_name }}
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
# GitHub jobs - full build and release
|
||||||
prepare:
|
prepare:
|
||||||
|
# Only run on GitHub, skip on Gitea
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- run: echo "exists just for outputs"
|
- run: echo "exists just for outputs"
|
||||||
@ -44,7 +67,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: ${{ env.BRANCH_NAME }}
|
ref: ${{ env.BRANCH_NAME }}
|
||||||
- name: Download Build Artifact
|
- name: Download Build Artifact
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
path: ./artifacts
|
path: ./artifacts
|
||||||
- name: Show Artifacts
|
- name: Show Artifacts
|
||||||
@ -58,35 +81,20 @@ jobs:
|
|||||||
ls -la ./release
|
ls -la ./release
|
||||||
tree ./release
|
tree ./release
|
||||||
- name: Create Tag
|
- name: Create Tag
|
||||||
if: github.event_name == 'workflow_dispatch'
|
|
||||||
run: |
|
run: |
|
||||||
git config --local user.email "action@gitea.com"
|
git config --local user.email "action@github.com"
|
||||||
git config --local user.name "Gitea Action"
|
git config --local user.name "GitHub Action"
|
||||||
|
|
||||||
TAG_NAME="v${RELEASE_VERSION}"
|
TAG_NAME="v${RELEASE_VERSION}"
|
||||||
git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}"
|
git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}"
|
||||||
git push origin "${TAG_NAME}"
|
git push origin "${TAG_NAME}"
|
||||||
- name: Create Release with assets
|
env:
|
||||||
uses: softprops/action-gh-release@v1
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Create Release Draft
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ env.RELEASE_VERSION }}
|
tag_name: v${{ env.RELEASE_VERSION }}
|
||||||
name: VoxelCore v${{ env.RELEASE_VERSION }}
|
|
||||||
body: |
|
|
||||||
## VoxelCore Release ${{ env.RELEASE_VERSION }}
|
|
||||||
|
|
||||||
### Downloads
|
|
||||||
- **Linux**: voxelcore-${{ env.RELEASE_VERSION }}_x86-64.AppImage
|
|
||||||
- **macOS**: voxelcore-${{ env.RELEASE_VERSION }}_macos.dmg
|
|
||||||
- **Windows**: voxelcore-${{ env.RELEASE_VERSION }}_win64.zip
|
|
||||||
|
|
||||||
### Installation
|
|
||||||
Download the appropriate file for your platform and run it.
|
|
||||||
|
|
||||||
---
|
|
||||||
**Full Changelog**: https://git.pyserve.org/PulseStudio/VoxelEngine/compare/v0.0.0...v${{ env.RELEASE_VERSION }}
|
|
||||||
draft: true
|
draft: true
|
||||||
prerelease: false
|
|
||||||
files: |
|
files: |
|
||||||
./release/*
|
./release/*
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
generate_release_notes: true
|
||||||
|
|
||||||
|
|||||||
6
.github/workflows/windows-clang.yml
vendored
6
.github/workflows/windows-clang.yml
vendored
@ -14,6 +14,8 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-windows:
|
build-windows:
|
||||||
|
# Only run on GitHub, skip on Gitea
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@ -64,7 +66,7 @@ jobs:
|
|||||||
cp build/*.dll packaged/
|
cp build/*.dll packaged/
|
||||||
cp -r build/res/* packaged/res/
|
cp -r build/res/* packaged/res/
|
||||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Windows-Build
|
name: Windows-Build
|
||||||
path: 'packaged/*'
|
path: 'packaged/*'
|
||||||
@ -72,4 +74,4 @@ jobs:
|
|||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
run: |
|
run: |
|
||||||
packaged/vctest.exe -e packaged/VoxelCore.exe -d dev/tests -u build
|
packaged/vctest.exe -e packaged/VoxelCore.exe -d dev/tests -u build
|
||||||
5
.github/workflows/windows.yml
vendored
5
.github/workflows/windows.yml
vendored
@ -8,6 +8,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-windows:
|
build-windows:
|
||||||
|
if: github.server_url == 'https://github.com'
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@ -47,7 +48,7 @@ jobs:
|
|||||||
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
|
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
|
||||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Windows-Build
|
name: Windows-Build
|
||||||
path: 'packaged/*'
|
path: 'packaged/*'
|
||||||
@ -42,7 +42,7 @@ target_link_options(VoxelEngine PRIVATE $<$<CXX_COMPILER_ID:GNU>:-no-pie>)
|
|||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET VoxelEngine
|
TARGET VoxelEngine
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:VoxelEngine>/res)
|
${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:VoxelEngine>/res)
|
||||||
|
|
||||||
if(VOXELENGINE_BUILD_TESTS)
|
if(VOXELENGINE_BUILD_TESTS)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Documentation
|
# Documentation
|
||||||
|
|
||||||
Documentation for 0.31.
|
Documentation for 0.31.12.
|
||||||
|
|
||||||
> [!WARNING]
|
> [!WARNING]
|
||||||
> Version is in development. Proceed to [Documentation for 0.30.](https://github.com/MihailRis/voxelcore/blob/release-0.30/doc/en/main-page.md)
|
> Version is in development. Proceed to [Documentation for 0.30.](https://github.com/MihailRis/voxelcore/blob/release-0.30/doc/en/main-page.md)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Документация
|
# Документация
|
||||||
|
|
||||||
Документация версии 0.31.
|
Документация версии 0.31.12.
|
||||||
|
|
||||||
> [!WARNING]
|
> [!WARNING]
|
||||||
> Версия находится в разработке. Перейдите к [документации для 0.30.](https://github.com/MihailRis/voxelcore/blob/release-0.30/doc/ru/main-page.md)
|
> Версия находится в разработке. Перейдите к [документации для 0.30.](https://github.com/MihailRis/voxelcore/blob/release-0.30/doc/ru/main-page.md)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"id": "base",
|
"id": "base",
|
||||||
"title": "Base",
|
"title": "Base",
|
||||||
"version": "0.31",
|
"version": "0.31.12",
|
||||||
"description": "basic content package"
|
"description": "basic content package"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,6 +14,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
|||||||
find_package(OpenAL CONFIG REQUIRED)
|
find_package(OpenAL CONFIG REQUIRED)
|
||||||
else()
|
else()
|
||||||
find_package(OpenAL REQUIRED)
|
find_package(OpenAL REQUIRED)
|
||||||
|
# Create OpenAL::OpenAL alias if not exists
|
||||||
|
if(NOT TARGET OpenAL::OpenAL AND TARGET OpenAL::AL)
|
||||||
|
add_library(OpenAL::OpenAL ALIAS OpenAL::AL)
|
||||||
|
elseif(NOT TARGET OpenAL::OpenAL AND OPENAL_FOUND)
|
||||||
|
add_library(OpenAL::OpenAL INTERFACE IMPORTED)
|
||||||
|
set_target_properties(OpenAL::OpenAL PROPERTIES
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${OPENAL_INCLUDE_DIR}"
|
||||||
|
INTERFACE_LINK_LIBRARIES "${OPENAL_LIBRARY}")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
find_package(PNG REQUIRED)
|
find_package(PNG REQUIRED)
|
||||||
|
|||||||
@ -14,7 +14,7 @@ inline constexpr bool ENGINE_DEBUG_BUILD = false;
|
|||||||
inline constexpr bool ENGINE_DEBUG_BUILD = true;
|
inline constexpr bool ENGINE_DEBUG_BUILD = true;
|
||||||
#endif // NDEBUG
|
#endif // NDEBUG
|
||||||
|
|
||||||
inline const std::string ENGINE_VERSION_STRING = "0.31";
|
inline const std::string ENGINE_VERSION_STRING = "0.31.12";
|
||||||
|
|
||||||
/// @brief world regions format version
|
/// @brief world regions format version
|
||||||
inline constexpr uint REGION_FORMAT_VERSION = 3;
|
inline constexpr uint REGION_FORMAT_VERSION = 3;
|
||||||
|
|||||||
@ -15,7 +15,7 @@ target_link_libraries(VoxelEngineTest PRIVATE VoxelEngineSrc GTest::gtest_main)
|
|||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET VoxelEngineTest
|
TARGET VoxelEngineTest
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||||
${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
|
${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
|
||||||
|
|
||||||
include(GoogleTest)
|
include(GoogleTest)
|
||||||
|
|||||||
@ -11,9 +11,19 @@ namespace fs = std::filesystem;
|
|||||||
|
|
||||||
TEST(YAML, EncodeDecode) {
|
TEST(YAML, EncodeDecode) {
|
||||||
io::set_device("root", std::make_shared<io::StdfsDevice>(fs::u8path("../../")));
|
io::set_device("root", std::make_shared<io::StdfsDevice>(fs::u8path("../../")));
|
||||||
auto filename = "root:.github/workflows/windows-clang.yml";
|
auto filename = "root:res/project.toml";
|
||||||
try {
|
try {
|
||||||
auto value = yaml::parse(io::read_string(filename));
|
// Test basic YAML parsing with a simple inline string
|
||||||
|
auto value = yaml::parse(R"(
|
||||||
|
name: test
|
||||||
|
version: 1.0
|
||||||
|
settings:
|
||||||
|
debug: true
|
||||||
|
values:
|
||||||
|
- one
|
||||||
|
- two
|
||||||
|
- three
|
||||||
|
)");
|
||||||
std::cout << yaml::stringify(value) << std::endl;
|
std::cout << yaml::stringify(value) << std::endl;
|
||||||
} catch (const parsing_error& error) {
|
} catch (const parsing_error& error) {
|
||||||
std::cerr << error.errorLog() << std::endl;
|
std::cerr << error.errorLog() << std::endl;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user