From 443622839c196b5338dfdb2c2d1d4b6a27809b74 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 28 Sep 2025 02:12:29 -0400 Subject: [PATCH] Remove Windows x86 build configurations from release workflows and update vcpkg commit ID for consistency --- .github/workflows/release-complex.yml | 18 +----------------- .github/workflows/release-simplified.yml | 9 +-------- .github/workflows/release.yml | 9 +-------- .github/workflows/validate-vs-build.yml | 13 ++----------- 4 files changed, 5 insertions(+), 44 deletions(-) diff --git a/.github/workflows/release-complex.yml b/.github/workflows/release-complex.yml index c5799143..c05e2004 100644 --- a/.github/workflows/release-complex.yml +++ b/.github/workflows/release-complex.yml @@ -124,22 +124,6 @@ jobs: cp README.md package/ 2>/dev/null || echo "README.md not found" cd package && zip -r ../yaze-windows-x64.zip * - - name: "Windows x86" - os: windows-2022 - vcpkg_triplet: x86-windows - cmake_generator: "Visual Studio 17 2022" - cmake_generator_platform: Win32 - artifact_name: "yaze-windows-x86" - artifact_path: "build/bin/Release/" - package_cmd: | - mkdir -p package - cp -r build/bin/Release/* package/ 2>/dev/null || echo "No Release binaries found, trying Debug..." - cp -r build/bin/Debug/* package/ 2>/dev/null || echo "No Debug binaries found" - cp -r assets package/ 2>/dev/null || echo "assets directory not found" - cp LICENSE package/ 2>/dev/null || echo "LICENSE not found" - cp README.md package/ 2>/dev/null || echo "README.md not found" - cd package && zip -r ../yaze-windows-x86.zip * - - name: "Windows ARM64" os: windows-2022 vcpkg_triplet: arm64-windows @@ -320,7 +304,7 @@ jobs: uses: lukka/run-vcpkg@v11 continue-on-error: true with: - vcpkgGitCommitId: '2024.12.12' + vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00' runVcpkgInstall: true vcpkgJsonGlob: '**/vcpkg.json' vcpkgDirectory: '${{ github.workspace }}/vcpkg' diff --git a/.github/workflows/release-simplified.yml b/.github/workflows/release-simplified.yml index 8dc5ade0..8ad3bc25 100644 --- a/.github/workflows/release-simplified.yml +++ b/.github/workflows/release-simplified.yml @@ -109,13 +109,6 @@ jobs: cmake_generator_platform: x64 artifact_name: "yaze-windows-x64" - - name: "Windows x86" - os: windows-2022 - vcpkg_triplet: x86-windows - cmake_generator: "Visual Studio 17 2022" - cmake_generator_platform: Win32 - artifact_name: "yaze-windows-x86" - - name: "Windows ARM64" os: windows-2022 vcpkg_triplet: arm64-windows @@ -176,7 +169,7 @@ jobs: if: runner.os == 'Windows' uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '2024.12.12' + vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00' runVcpkgInstall: true vcpkgJsonGlob: '**/vcpkg.json' vcpkgDirectory: '${{ github.workspace }}/vcpkg' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8721f0d..b1b0fd61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,13 +109,6 @@ jobs: cmake_generator_platform: x64 artifact_name: "yaze-windows-x64" - - name: "Windows x86" - os: windows-2022 - vcpkg_triplet: x86-windows - cmake_generator: "Visual Studio 17 2022" - cmake_generator_platform: Win32 - artifact_name: "yaze-windows-x86" - - name: "Windows ARM64" os: windows-2022 vcpkg_triplet: arm64-windows @@ -176,7 +169,7 @@ jobs: if: runner.os == 'Windows' uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '2024.12.12' + vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00' runVcpkgInstall: true vcpkgJsonGlob: '**/vcpkg.json' vcpkgDirectory: '${{ github.workspace }}/vcpkg' diff --git a/.github/workflows/validate-vs-build.yml b/.github/workflows/validate-vs-build.yml index 55c26bc5..c7caaae8 100644 --- a/.github/workflows/validate-vs-build.yml +++ b/.github/workflows/validate-vs-build.yml @@ -4,19 +4,17 @@ on: push: branches: [ "master", "develop" ] paths: - - 'yaze.vcxproj' - - 'yaze.sln' - 'vcpkg.json' - 'src/**' + - 'scripts/generate-vs-projects.py' - 'scripts/validate-vs-build.ps1' - '.github/workflows/validate-vs-build.yml' pull_request: branches: [ "master", "develop" ] paths: - - 'yaze.vcxproj' - - 'yaze.sln' - 'vcpkg.json' - 'src/**' + - 'scripts/generate-vs-projects.py' - 'scripts/validate-vs-build.ps1' - '.github/workflows/validate-vs-build.yml' @@ -37,13 +35,6 @@ jobs: platform: x64 configuration: Release - - name: "Windows x86 Debug" - platform: x86 - configuration: Debug - - - name: "Windows x86 Release" - platform: x86 - configuration: Release name: ${{ matrix.name }} runs-on: windows-2022