Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3da03fdd7f | ||
|
|
21874e98c2 | ||
|
|
70aa850999 | ||
|
|
b1837571cc |
@@ -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
|
||||||
@@ -59,7 +64,7 @@ jobs:
|
|||||||
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
||||||
with:
|
with:
|
||||||
recipe: dev/AppImageBuilder.yml
|
recipe: dev/AppImageBuilder.yml
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: AppImage
|
name: AppImage
|
||||||
path: './*.AppImage*'
|
path: './*.AppImage*'
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -68,7 +73,7 @@ jobs:
|
|||||||
run: ctest --test-dir ${{github.workspace}}/build
|
run: ctest --test-dir ${{github.workspace}}/build
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
if: ${{ inputs.upload_artifacts }}
|
if: ${{ inputs.upload_artifacts }}
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: VoxelEngine
|
name: VoxelEngine
|
||||||
path: |
|
path: |
|
||||||
|
|||||||
@@ -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'
|
||||||
@@ -55,7 +62,7 @@ jobs:
|
|||||||
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: VoxelEngineMacOs
|
name: VoxelEngineMacOs
|
||||||
path: VoxelEngineMacApp.dmg
|
path: VoxelEngineMacApp.dmg
|
||||||
|
|||||||
@@ -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,14 +32,14 @@ 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
|
||||||
with:
|
with:
|
||||||
ref: ${{ env.BRANCH_NAME }}
|
ref: ${{ env.BRANCH_NAME }}
|
||||||
- name: Download Build Artifact
|
- name: Download Build Artifact
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
path: ./artifacts
|
path: ./artifacts
|
||||||
- name: Show Artifacts
|
- name: Show Artifacts
|
||||||
@@ -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,4 +1,4 @@
|
|||||||
name: Windows Build (CLang)
|
name: Windows Build (Cross-compile)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
@@ -14,62 +14,61 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-windows:
|
build-windows:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- os: windows-latest
|
|
||||||
compiler: clang
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: 'true'
|
submodules: 'true'
|
||||||
- uses: msys2/setup-msys2@v2
|
|
||||||
id: msys2
|
- name: Install cross-compilation tools
|
||||||
name: Setup MSYS2
|
run: |
|
||||||
with:
|
sudo apt-get update
|
||||||
msystem: clang64
|
sudo apt-get install -y mingw-w64 cmake wget git zip
|
||||||
install: >-
|
|
||||||
mingw-w64-clang-x86_64-toolchain
|
- name: Install CMake >= 3.26
|
||||||
mingw-w64-clang-x86_64-cmake
|
run: |
|
||||||
git
|
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
|
- name: Set up vcpkg
|
||||||
shell: msys2 {0}
|
|
||||||
run: |
|
run: |
|
||||||
git clone https://github.com/microsoft/vcpkg.git
|
git clone https://github.com/microsoft/vcpkg.git
|
||||||
cd vcpkg
|
cd vcpkg
|
||||||
./bootstrap-vcpkg.bat
|
./bootstrap-vcpkg.sh
|
||||||
./vcpkg integrate install
|
cd ..
|
||||||
cd ..
|
|
||||||
- name: Configure project with CMake and vcpkg
|
- name: Configure and build project
|
||||||
env:
|
env:
|
||||||
VCPKG_DEFAULT_TRIPLET: x64-mingw-static
|
VCPKG_DEFAULT_TRIPLET: x64-mingw-static
|
||||||
VCPKG_DEFAULT_HOST_TRIPLET: x64-mingw-static
|
VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
|
||||||
shell: msys2 {0}
|
|
||||||
run: |
|
run: |
|
||||||
export VCPKG_ROOT=$(pwd)/vcpkg
|
export VCPKG_ROOT=$(pwd)/vcpkg
|
||||||
mkdir build
|
mkdir build
|
||||||
cd 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 -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \
|
||||||
cmake --build . --config Release
|
-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
|
- name: Package for Windows
|
||||||
run: |
|
run: |
|
||||||
mkdir packaged
|
mkdir packaged
|
||||||
mkdir packaged/res
|
mkdir packaged/res
|
||||||
cp build/VoxelEngine.exe packaged/
|
cp build/VoxelEngine.exe packaged/VoxelCore.exe || cp build/VoxelEngine packaged/VoxelCore.exe
|
||||||
cp build/vctest/vctest.exe packaged/
|
cp build/vctest/vctest.exe packaged/ || cp build/vctest/vctest packaged/vctest.exe
|
||||||
cp build/*.dll packaged/
|
cp build/*.dll packaged/ 2>/dev/null || true
|
||||||
cp -r build/res/* packaged/res/
|
cp -r build/res/* packaged/res/
|
||||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Windows-Build
|
name: Windows-Build
|
||||||
path: 'packaged/*'
|
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
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
|
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
|
||||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: Windows-Build
|
name: Windows-Build
|
||||||
path: 'packaged/*'
|
path: 'packaged/*'
|
||||||
|
|||||||
Reference in New Issue
Block a user