fix: add macOS runner check to workflow and remove macOS build step from release

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

.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 -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 -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

@@ -25,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
@@ -37,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
@@ -52,8 +47,6 @@ 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
@@ -76,7 +69,6 @@ jobs:
           
           ### Downloads
           - **Linux**: voxelcore-${{ env.RELEASE_VERSION }}_x86-64.AppImage
-          - **macOS**: voxelcore-${{ env.RELEASE_VERSION }}_macos.dmg
           - **Windows**: voxelcore-${{ env.RELEASE_VERSION }}_win64.zip
           
           ### Installation

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;

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)