Compare commits

..

No commits in common. "main" and "v0.31.0" have entirely different histories.

15 changed files with 47 additions and 87 deletions

View File

@ -14,8 +14,6 @@ on:
jobs:
build-appimage:
# Only run on GitHub, skip on Gitea
if: github.server_url == 'https://github.com'
strategy:
matrix:
@ -50,8 +48,7 @@ jobs:
- name: Run tests
run: ctest --test-dir build
- name: Run engine tests
timeout-minutes: 3
continue-on-error: true
timeout-minutes: 1
run: |
chmod +x build/VoxelEngine
chmod +x AppDir/usr/bin/vctest
@ -62,7 +59,7 @@ jobs:
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
with:
recipe: dev/AppImageBuilder.yml
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: AppImage
path: './*.AppImage*'
path: './*.AppImage*'

View File

@ -8,10 +8,8 @@ on:
jobs:
build:
# Only run on GitHub, skip on Gitea
if: github.server_url == 'https://github.com'
name: Build
uses: ./.github/workflows/cmake.yml
with:
build_type: Release
run_tests: true
run_tests: true

View File

@ -19,8 +19,6 @@ on:
jobs:
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.
# 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
@ -41,7 +39,7 @@ jobs:
# make && make install INSTALL_INC=/usr/include/lua
run: |
sudo apt-get update
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
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
# 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/include/luajit-2.1 /usr/include/lua
@ -70,9 +68,9 @@ jobs:
run: ctest --test-dir ${{github.workspace}}/build
- name: Upload artifacts
if: ${{ inputs.upload_artifacts }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: VoxelEngine
path: |
VoxelEngine
res/*
res/*

View File

@ -14,8 +14,6 @@ on:
jobs:
build-dmg:
# Only run on GitHub, skip on Gitea
if: github.server_url == 'https://github.com'
runs-on: macos-latest
steps:
@ -43,8 +41,7 @@ jobs:
run: ctest --output-on-failure --test-dir build
- name: Run engine tests
timeout-minutes: 3
continue-on-error: true
timeout-minutes: 1
run: |
chmod +x build/VoxelEngine
chmod +x AppDir/usr/bin/vctest
@ -58,7 +55,7 @@ jobs:
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
- name: Upload artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: VoxelEngineMacOs
path: VoxelEngineMacApp.dmg
path: VoxelEngineMacApp.dmg

View File

@ -1,4 +1,5 @@
name: Release
name: Build and Release
run-name: ${{ github.actor }} preparing release
on:
push:
tags:
@ -13,31 +14,7 @@ env:
RELEASE_VERSION: ${{ github.event.inputs.version || github.ref_name || 'testrelease' }}
BRANCH_NAME: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}
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:
# Only run on GitHub, skip on Gitea
if: github.server_url == 'https://github.com'
runs-on: ubuntu-latest
steps:
- run: echo "exists just for outputs"
@ -67,7 +44,7 @@ jobs:
with:
ref: ${{ env.BRANCH_NAME }}
- name: Download Build Artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
path: ./artifacts
- name: Show Artifacts
@ -81,20 +58,35 @@ jobs:
ls -la ./release
tree ./release
- name: Create Tag
if: github.event_name == 'workflow_dispatch'
run: |
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git config --local user.email "action@gitea.com"
git config --local user.name "Gitea Action"
TAG_NAME="v${RELEASE_VERSION}"
git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}"
git push origin "${TAG_NAME}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create Release Draft
uses: softprops/action-gh-release@v2
- name: Create Release with assets
uses: softprops/action-gh-release@v1
with:
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
prerelease: false
files: |
./release/*
generate_release_notes: true
token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -14,8 +14,6 @@ on:
jobs:
build-windows:
# Only run on GitHub, skip on Gitea
if: github.server_url == 'https://github.com'
strategy:
matrix:
@ -66,7 +64,7 @@ jobs:
cp build/*.dll packaged/
cp -r build/res/* packaged/res/
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: Windows-Build
path: 'packaged/*'
@ -74,4 +72,4 @@ jobs:
shell: msys2 {0}
working-directory: ${{ github.workspace }}
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

View File

@ -8,7 +8,6 @@ on:
jobs:
build-windows:
if: github.server_url == 'https://github.com'
strategy:
matrix:
@ -48,7 +47,7 @@ jobs:
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
working-directory: ${{ github.workspace }}
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: Windows-Build
path: 'packaged/*'
path: 'packaged/*'

View File

@ -42,7 +42,7 @@ target_link_options(VoxelEngine PRIVATE $<$<CXX_COMPILER_ID:GNU>:-no-pie>)
add_custom_command(
TARGET VoxelEngine
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:VoxelEngine>/res)
if(VOXELENGINE_BUILD_TESTS)

View File

@ -1,6 +1,6 @@
# Documentation
Documentation for 0.31.12.
Documentation for 0.31.
> [!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)

View File

@ -1,6 +1,6 @@
# Документация
Документация версии 0.31.12.
Документация версии 0.31.
> [!WARNING]
> Версия находится в разработке. Перейдите к [документации для 0.30.](https://github.com/MihailRis/voxelcore/blob/release-0.30/doc/ru/main-page.md)

View File

@ -1,6 +1,6 @@
{
"id": "base",
"title": "Base",
"version": "0.31.12",
"version": "0.31",
"description": "basic content package"
}

View File

@ -14,15 +14,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(OpenAL CONFIG REQUIRED)
else()
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()
find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)

View File

@ -14,7 +14,7 @@ inline constexpr bool ENGINE_DEBUG_BUILD = false;
inline constexpr bool ENGINE_DEBUG_BUILD = true;
#endif // NDEBUG
inline const std::string ENGINE_VERSION_STRING = "0.31.12";
inline const std::string ENGINE_VERSION_STRING = "0.31";
/// @brief world regions format version
inline constexpr uint REGION_FORMAT_VERSION = 3;

View File

@ -15,7 +15,7 @@ target_link_libraries(VoxelEngineTest PRIVATE VoxelEngineSrc GTest::gtest_main)
add_custom_command(
TARGET VoxelEngineTest
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
include(GoogleTest)

View File

@ -11,19 +11,9 @@ namespace fs = std::filesystem;
TEST(YAML, EncodeDecode) {
io::set_device("root", std::make_shared<io::StdfsDevice>(fs::u8path("../../")));
auto filename = "root:res/project.toml";
auto filename = "root:.github/workflows/windows-clang.yml";
try {
// 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
)");
auto value = yaml::parse(io::read_string(filename));
std::cout << yaml::stringify(value) << std::endl;
} catch (const parsing_error& error) {
std::cerr << error.errorLog() << std::endl;