fix: upgrade actions/upload-artifact from v3 to v4 across workflow files

- copy_directory_if_different doesn't exist in CMake 3.22
- Use standard copy_directory command instead

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: ['https://boosty.to/mihailris']

.github/workflows/appimage.yml

@@ -31,7 +31,12 @@ 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 cmake squashfs-tools valgrind
+            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
           # 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

.github/workflows/cmake.yml

@@ -39,7 +39,12 @@ 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 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
           # 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

.github/workflows/macos.yml

@@ -17,6 +17,13 @@ jobs:
     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'

.github/workflows/release.yml

@@ -1,5 +1,9 @@
-name: Release
+name: Build and Release
+run-name: ${{ github.actor }} preparing release
 on:
+  push:
+    tags:
+      - 'v*'
   workflow_dispatch:
     inputs:
       version:
@@ -7,7 +11,7 @@ on:
         required: true
         default: "0.0.0"
 env:
-  RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }}
+  RELEASE_VERSION: ${{ github.event.inputs.version || github.ref_name || 'testrelease' }}
   BRANCH_NAME: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}
 jobs:
   prepare:
@@ -21,11 +25,6 @@ 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
@@ -33,7 +32,7 @@ jobs:
       build_name: '${{ needs.prepare.outputs.build_name }}'
   publish_release:
     runs-on: ubuntu-latest
-    needs: [build_linux, build_macos, build_windows]
+    needs: [build_linux, build_windows]
     steps:
     - name: Checkout Release Branch
       uses: actions/checkout@v4
@@ -48,27 +47,38 @@ 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@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
+          - **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 }}
 

.github/workflows/windows-clang.yml

@@ -1,4 +1,4 @@
-name: Windows Build (CLang)
+name: Windows Build (Cross-compile)
 
 on:
   push:
@@ -14,62 +14,61 @@ on:
 
 jobs:
   build-windows:
-
-    strategy:
-      matrix:
-        include:
-          - os: windows-latest
-            compiler: clang
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: msys2/setup-msys2@v2
-        id: msys2
-        name: Setup MSYS2
-        with:
-            msystem: clang64
-            install: >-
-                mingw-w64-clang-x86_64-toolchain 
-                mingw-w64-clang-x86_64-cmake
-                git
+
+      - name: Install cross-compilation tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y mingw-w64 cmake wget git zip
+
+      - name: Install CMake >= 3.26
+        run: |
+          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
+
       - name: Set up vcpkg
-        shell: msys2 {0}
         run: |
-            git clone https://github.com/microsoft/vcpkg.git
-            cd vcpkg
-            ./bootstrap-vcpkg.bat
-            ./vcpkg integrate install
-            cd ..
-      - name: Configure project with CMake and vcpkg
+          git clone https://github.com/microsoft/vcpkg.git
+          cd vcpkg
+          ./bootstrap-vcpkg.sh
+          cd ..
+
+      - name: Configure and build project
         env:
-            VCPKG_DEFAULT_TRIPLET: x64-mingw-static
-            VCPKG_DEFAULT_HOST_TRIPLET: x64-mingw-static
-        shell: msys2 {0}
+          VCPKG_DEFAULT_TRIPLET: x64-mingw-static
+          VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
         run: |
-            export VCPKG_ROOT=$(pwd)/vcpkg
-            mkdir build
-            cd build
-            cmake -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DVC_BUILD_NAME="${{ inputs.build_name }}" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ..
-            cmake --build . --config Release
+          export VCPKG_ROOT=$(pwd)/vcpkg
+          mkdir build
+          cd build
+          cmake -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \
+                -DVCPKG_TARGET_TRIPLET=x64-mingw-static \
+                -DCMAKE_SYSTEM_NAME=Windows \
+                -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \
+                -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ \
+                -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DVC_BUILD_NAME="${{ inputs.build_name }}" \
+                ..
+          cmake --build . --config Release
+
       - name: Package for Windows
         run: |
           mkdir packaged
           mkdir packaged/res
-          cp build/VoxelEngine.exe packaged/
-          cp build/vctest/vctest.exe packaged/
-          cp build/*.dll packaged/
+          cp build/VoxelEngine.exe packaged/VoxelCore.exe || cp build/VoxelEngine packaged/VoxelCore.exe
+          cp build/vctest/vctest.exe packaged/ || cp build/vctest/vctest packaged/vctest.exe
+          cp build/*.dll packaged/ 2>/dev/null || true
           cp -r build/res/* packaged/res/
-          mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
+
       - uses: actions/upload-artifact@v4
         with:
           name: Windows-Build
           path: 'packaged/*'
-      - name: Run engine tests
-        shell: msys2 {0}
-        working-directory: ${{ github.workspace }}
-        run: |
-          packaged/vctest.exe -e packaged/VoxelCore.exe -d dev/tests -u build

CMakeLists.txt

@@ -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_if_different
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
             ${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:VoxelEngine>/res)
 
 if(VOXELENGINE_BUILD_TESTS)

doc/en/main-page.md

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

doc/ru/main-page.md

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

res/content/base/package.json

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

src/CMakeLists.txt

@@ -14,6 +14,15 @@ 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)

src/constants.hpp

@@ -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";
+inline const std::string ENGINE_VERSION_STRING = "0.31.1";
 
 /// @brief world regions format version
 inline constexpr uint REGION_FORMAT_VERSION = 3;

src/util/ObjectsPool.hpp

@@ -35,7 +35,9 @@ namespace util {
         std::shared_ptr<T> create(Args&&... args) {
             std::lock_guard lock(mutex);
             if (freeObjects.empty()) {
-                if (!allocateNew()) {
+                try {
+                    allocateNew();
+                } catch (const std::bad_alloc&) {
                     return std::make_shared<T>(std::forward<Args>(args)...);
                 }
             }

test/CMakeLists.txt

@@ -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_if_different
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
             ${CMAKE_SOURCE_DIR}/res ${CMAKE_CURRENT_BINARY_DIR}/res)
 
 include(GoogleTest)