Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70aa850999 | ||
|
|
b1837571cc | ||
|
|
51ff1868ac |
@@ -31,7 +31,12 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \
|
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 \
|
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
|
# 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/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
|
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
||||||
|
|||||||
@@ -39,7 +39,12 @@ 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 -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
|
# 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
|
||||||
|
|||||||
@@ -17,6 +17,13 @@ jobs:
|
|||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
|
||||||
steps:
|
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
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
submodules: 'true'
|
submodules: 'true'
|
||||||
|
|||||||
@@ -25,11 +25,6 @@ jobs:
|
|||||||
uses: ./.github/workflows/appimage.yml
|
uses: ./.github/workflows/appimage.yml
|
||||||
with:
|
with:
|
||||||
build_name: '${{ needs.prepare.outputs.build_name }}'
|
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:
|
build_windows:
|
||||||
needs: [prepare]
|
needs: [prepare]
|
||||||
uses: ./.github/workflows/windows-clang.yml
|
uses: ./.github/workflows/windows-clang.yml
|
||||||
@@ -37,7 +32,7 @@ jobs:
|
|||||||
build_name: '${{ needs.prepare.outputs.build_name }}'
|
build_name: '${{ needs.prepare.outputs.build_name }}'
|
||||||
publish_release:
|
publish_release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build_linux, build_macos, build_windows]
|
needs: [build_linux, build_windows]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Release Branch
|
- name: Checkout Release Branch
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -52,8 +47,6 @@ jobs:
|
|||||||
mkdir release
|
mkdir release
|
||||||
mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \
|
mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \
|
||||||
./release/voxelcore-${RELEASE_VERSION}_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 .)
|
(cd ./artifacts/Windows-Build && zip -r ../../release/voxelcore-${RELEASE_VERSION}_win64.zip .)
|
||||||
ls -la ./release
|
ls -la ./release
|
||||||
tree ./release
|
tree ./release
|
||||||
@@ -76,7 +69,6 @@ jobs:
|
|||||||
|
|
||||||
### Downloads
|
### Downloads
|
||||||
- **Linux**: voxelcore-${{ env.RELEASE_VERSION }}_x86-64.AppImage
|
- **Linux**: voxelcore-${{ env.RELEASE_VERSION }}_x86-64.AppImage
|
||||||
- **macOS**: voxelcore-${{ env.RELEASE_VERSION }}_macos.dmg
|
|
||||||
- **Windows**: voxelcore-${{ env.RELEASE_VERSION }}_win64.zip
|
- **Windows**: voxelcore-${{ env.RELEASE_VERSION }}_win64.zip
|
||||||
|
|
||||||
### Installation
|
### Installation
|
||||||
|
|||||||
+1
-1
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user