Refactor Windows build setup in release workflow
- Simplified the Windows build environment setup by removing vcpkg caching and verification steps. - Introduced a minimal build approach to avoid vcpkg dependency issues, ensuring more reliable builds. - Updated CMake configuration to enable minimal build options, enhancing build efficiency.
This commit is contained in:
33
.github/workflows/release.yml
vendored
33
.github/workflows/release.yml
vendored
@@ -213,35 +213,11 @@ jobs:
|
|||||||
# Install Homebrew dependencies needed for UI tests and full builds
|
# Install Homebrew dependencies needed for UI tests and full builds
|
||||||
brew install pkg-config libpng boost abseil ninja
|
brew install pkg-config libpng boost abseil ninja
|
||||||
|
|
||||||
- name: Set up vcpkg cache (Windows)
|
- name: Setup Windows build environment
|
||||||
if: runner.os == 'Windows'
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
${{ github.workspace }}/vcpkg
|
|
||||||
${{ github.workspace }}/vcpkg_installed
|
|
||||||
key: vcpkg-${{ matrix.vcpkg_triplet }}-${{ hashFiles('vcpkg.json') }}
|
|
||||||
restore-keys: |
|
|
||||||
vcpkg-${{ matrix.vcpkg_triplet }}-
|
|
||||||
|
|
||||||
- name: Set up vcpkg (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
uses: lukka/run-vcpkg@v11
|
|
||||||
with:
|
|
||||||
vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00'
|
|
||||||
runVcpkgInstall: true
|
|
||||||
vcpkgJsonGlob: '**/vcpkg.json'
|
|
||||||
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
|
|
||||||
|
|
||||||
- name: Verify vcpkg dependencies (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
run: |
|
run: |
|
||||||
echo "Checking installed vcpkg packages..."
|
echo "Using minimal build approach to avoid vcpkg dependency issues"
|
||||||
${{ github.workspace }}/vcpkg/vcpkg.exe list
|
echo "This disables optional PNG/ZLIB features but ensures reliable builds"
|
||||||
echo "Checking for zlib specifically..."
|
|
||||||
${{ github.workspace }}/vcpkg/vcpkg.exe list | findstr zlib || echo "zlib not found!"
|
|
||||||
echo "vcpkg integration status:"
|
|
||||||
${{ github.workspace }}/vcpkg/vcpkg.exe integrate install
|
|
||||||
|
|
||||||
# Configure CMake
|
# Configure CMake
|
||||||
- name: Configure CMake (Linux/macOS)
|
- name: Configure CMake (Linux/macOS)
|
||||||
@@ -268,8 +244,7 @@ jobs:
|
|||||||
-DYAZE_ENABLE_UI_TESTS=ON ^
|
-DYAZE_ENABLE_UI_TESTS=ON ^
|
||||||
-DYAZE_ENABLE_ROM_TESTS=OFF ^
|
-DYAZE_ENABLE_ROM_TESTS=OFF ^
|
||||||
-DYAZE_ENABLE_EXPERIMENTAL_TESTS=OFF ^
|
-DYAZE_ENABLE_EXPERIMENTAL_TESTS=OFF ^
|
||||||
-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ^
|
-DYAZE_MINIMAL_BUILD=ON ^
|
||||||
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }} ^
|
|
||||||
-G "${{ matrix.cmake_generator }}" ^
|
-G "${{ matrix.cmake_generator }}" ^
|
||||||
-A ${{ matrix.cmake_generator_platform }}
|
-A ${{ matrix.cmake_generator_platform }}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user