Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd5dbc6494 | ||
|
|
c58bb6cd2c | ||
|
|
f4c4fb21c0 | ||
|
|
c7f98a176f | ||
|
|
3da03fdd7f | ||
|
|
21874e98c2 |
16
.github/workflows/appimage.yml
vendored
16
.github/workflows/appimage.yml
vendored
@ -14,6 +14,8 @@ on:
|
||||
|
||||
jobs:
|
||||
build-appimage:
|
||||
# Only run on GitHub, skip on Gitea
|
||||
if: github.server_url == 'https://github.com'
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
@ -31,12 +33,7 @@ jobs:
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \
|
||||
libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \
|
||||
libcurl4-openssl-dev libgtest-dev squashfs-tools valgrind wget
|
||||
# Install CMake >= 3.26
|
||||
wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.sh
|
||||
chmod +x cmake-3.27.9-linux-x86_64.sh
|
||||
sudo ./cmake-3.27.9-linux-x86_64.sh --skip-license --prefix=/usr/local
|
||||
rm cmake-3.27.9-linux-x86_64.sh
|
||||
libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind
|
||||
# fix luajit paths
|
||||
sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua5.1.a
|
||||
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
||||
@ -53,7 +50,8 @@ jobs:
|
||||
- name: Run tests
|
||||
run: ctest --test-dir build
|
||||
- name: Run engine tests
|
||||
timeout-minutes: 1
|
||||
timeout-minutes: 3
|
||||
continue-on-error: true
|
||||
run: |
|
||||
chmod +x build/VoxelEngine
|
||||
chmod +x AppDir/usr/bin/vctest
|
||||
@ -64,7 +62,7 @@ jobs:
|
||||
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
||||
with:
|
||||
recipe: dev/AppImageBuilder.yml
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: AppImage
|
||||
path: './*.AppImage*'
|
||||
path: './*.AppImage*'
|
||||
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -8,8 +8,10 @@ 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
|
||||
13
.github/workflows/cmake.yml
vendored
13
.github/workflows/cmake.yml
vendored
@ -19,6 +19,8 @@ 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
|
||||
@ -39,12 +41,7 @@ jobs:
|
||||
# make && make install INSTALL_INC=/usr/include/lua
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev wget
|
||||
# Install CMake >= 3.26
|
||||
wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.sh
|
||||
chmod +x cmake-3.27.9-linux-x86_64.sh
|
||||
sudo ./cmake-3.27.9-linux-x86_64.sh --skip-license --prefix=/usr/local
|
||||
rm cmake-3.27.9-linux-x86_64.sh
|
||||
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
|
||||
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
|
||||
@ -73,9 +70,9 @@ jobs:
|
||||
run: ctest --test-dir ${{github.workspace}}/build
|
||||
- name: Upload artifacts
|
||||
if: ${{ inputs.upload_artifacts }}
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: VoxelEngine
|
||||
path: |
|
||||
VoxelEngine
|
||||
res/*
|
||||
res/*
|
||||
16
.github/workflows/macos.yml
vendored
16
.github/workflows/macos.yml
vendored
@ -14,16 +14,11 @@ on:
|
||||
|
||||
jobs:
|
||||
build-dmg:
|
||||
# Only run on GitHub, skip on Gitea
|
||||
if: github.server_url == 'https://github.com'
|
||||
runs-on: macos-latest
|
||||
|
||||
steps:
|
||||
- name: Check if running on macOS
|
||||
run: |
|
||||
if [[ "$(uname)" != "Darwin" ]]; then
|
||||
echo "::error::This workflow requires a real macOS runner, not Docker"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: 'true'
|
||||
@ -48,7 +43,8 @@ jobs:
|
||||
run: ctest --output-on-failure --test-dir build
|
||||
|
||||
- name: Run engine tests
|
||||
timeout-minutes: 1
|
||||
timeout-minutes: 3
|
||||
continue-on-error: true
|
||||
run: |
|
||||
chmod +x build/VoxelEngine
|
||||
chmod +x AppDir/usr/bin/vctest
|
||||
@ -62,7 +58,7 @@ jobs:
|
||||
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: VoxelEngineMacOs
|
||||
path: VoxelEngineMacApp.dmg
|
||||
path: VoxelEngineMacApp.dmg
|
||||
66
.github/workflows/release.yml
vendored
66
.github/workflows/release.yml
vendored
@ -1,5 +1,4 @@
|
||||
name: Build and Release
|
||||
run-name: ${{ github.actor }} preparing release
|
||||
name: Release
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
@ -14,7 +13,31 @@ 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"
|
||||
@ -25,6 +48,11 @@ jobs:
|
||||
uses: ./.github/workflows/appimage.yml
|
||||
with:
|
||||
build_name: '${{ needs.prepare.outputs.build_name }}'
|
||||
build_macos:
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/macos.yml
|
||||
with:
|
||||
build_name: '${{ needs.prepare.outputs.build_name }}'
|
||||
build_windows:
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/windows-clang.yml
|
||||
@ -32,14 +60,14 @@ jobs:
|
||||
build_name: '${{ needs.prepare.outputs.build_name }}'
|
||||
publish_release:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build_linux, build_windows]
|
||||
needs: [build_linux, build_macos, build_windows]
|
||||
steps:
|
||||
- name: Checkout Release Branch
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ env.BRANCH_NAME }}
|
||||
- name: Download Build Artifact
|
||||
uses: actions/download-artifact@v3
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: ./artifacts
|
||||
- name: Show Artifacts
|
||||
@ -47,38 +75,26 @@ jobs:
|
||||
mkdir release
|
||||
mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \
|
||||
./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage
|
||||
mv ./artifacts/VoxelEngineMacOs/VoxelEngineMacApp.dmg \
|
||||
./release/voxelcore-${RELEASE_VERSION}_macos.dmg
|
||||
(cd ./artifacts/Windows-Build && zip -r ../../release/voxelcore-${RELEASE_VERSION}_win64.zip .)
|
||||
ls -la ./release
|
||||
tree ./release
|
||||
- name: Create Tag
|
||||
if: github.event_name == 'workflow_dispatch'
|
||||
run: |
|
||||
git config --local user.email "action@gitea.com"
|
||||
git config --local user.name "Gitea Action"
|
||||
git config --local user.email "action@github.com"
|
||||
git config --local user.name "GitHub Action"
|
||||
|
||||
TAG_NAME="v${RELEASE_VERSION}"
|
||||
git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}"
|
||||
git push origin "${TAG_NAME}"
|
||||
- name: Create Release with assets
|
||||
uses: softprops/action-gh-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Create Release Draft
|
||||
uses: softprops/action-gh-release@v2
|
||||
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
|
||||
- **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/*
|
||||
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:
|
||||
build-windows:
|
||||
# Only run on GitHub, skip on Gitea
|
||||
if: github.server_url == 'https://github.com'
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
@ -64,7 +66,7 @@ jobs:
|
||||
cp build/*.dll packaged/
|
||||
cp -r build/res/* packaged/res/
|
||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Windows-Build
|
||||
path: 'packaged/*'
|
||||
@ -72,4 +74,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
|
||||
5
.github/workflows/windows.yml
vendored
5
.github/workflows/windows.yml
vendored
@ -8,6 +8,7 @@ on:
|
||||
|
||||
jobs:
|
||||
build-windows:
|
||||
if: github.server_url == 'https://github.com'
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
@ -47,7 +48,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@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Windows-Build
|
||||
path: 'packaged/*'
|
||||
path: 'packaged/*'
|
||||
@ -1,6 +1,6 @@
|
||||
# Documentation
|
||||
|
||||
Documentation for 0.31.1.
|
||||
Documentation for 0.31.12.
|
||||
|
||||
> [!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)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Документация
|
||||
|
||||
Документация версии 0.31.1.
|
||||
Документация версии 0.31.12.
|
||||
|
||||
> [!WARNING]
|
||||
> Версия находится в разработке. Перейдите к [документации для 0.30.](https://github.com/MihailRis/voxelcore/blob/release-0.30/doc/ru/main-page.md)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"id": "base",
|
||||
"title": "Base",
|
||||
"version": "0.31.1",
|
||||
"version": "0.31.12",
|
||||
"description": "basic content package"
|
||||
}
|
||||
|
||||
@ -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.1";
|
||||
inline const std::string ENGINE_VERSION_STRING = "0.31.12";
|
||||
|
||||
/// @brief world regions format version
|
||||
inline constexpr uint REGION_FORMAT_VERSION = 3;
|
||||
|
||||
@ -11,9 +11,19 @@ namespace fs = std::filesystem;
|
||||
|
||||
TEST(YAML, EncodeDecode) {
|
||||
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 {
|
||||
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;
|
||||
} catch (const parsing_error& error) {
|
||||
std::cerr << error.errorLog() << std::endl;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user