3 Commits
Author SHA1 Message Date
ShiftyX1 3da03fdd7f fix: upgrade actions/upload-artifact from v3 to v4 across workflow files
Build and Release / prepare (push) Successful in 1s
Build and Release / build_windows (push) Has been cancelled
Build and Release / publish_release (push) Has been cancelled
Build and Release / build_linux (push) Has been cancelled
2025-12-09 00:40:18 +03:00
ShiftyX1 21874e98c2 fix: update Windows build workflow for cross-compilation and improve CMake configuration
Build / Build (push) Has been cancelled
MSVC Build / build-windows (windows-latest) (push) Has been cancelled
2025-12-09 00:33:55 +03:00
ShiftyX1 70aa850999 fix: add macOS runner check to workflow and remove macOS build step from release
Build / Build (push) Successful in 9m26s
Build and Release / prepare (push) Successful in 0s
MSVC Build / build-windows (windows-latest) (push) Has been cancelled
Build and Release / build_linux (push) Successful in 10m4s
Build and Release / build_windows (push) Failing after 13s
Build and Release / publish_release (push) Has been skipped
2025-12-09 00:08:14 +03:00
6 changed files with 56 additions and 58 deletions
+1 -1
View File
@@ -64,7 +64,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*'
+1 -1
View File
@@ -73,7 +73,7 @@ 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: |
+8 -1
View File
@@ -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'
@@ -55,7 +62,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
+2 -10
View File
@@ -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,14 +32,14 @@ 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
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
@@ -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
+43 -44
View File
@@ -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@v3
- 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
+1 -1
View File
@@ -47,7 +47,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/*'