From 842878eeb3cb2aede3d71fe4f4a3fcdaaed3569b Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 27 Sep 2025 21:29:05 -0400 Subject: [PATCH] Remove vcpkg.json.backup and streamline CI/CD workflow - Deleted the vcpkg.json.backup file to eliminate redundancy in project configuration. - Updated the CI/CD workflow to simplify the fallback mechanism for dependency installation on Windows, ensuring a more efficient build process. --- .github/workflows/release.yml | 15 +-------------- vcpkg.json.backup | 31 ------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 vcpkg.json.backup diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5589a77b..94c79a2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -265,20 +265,7 @@ jobs: VCPKG_FORCE_SYSTEM_BINARIES: 1 VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - # Fallback to newer baseline if primary vcpkg fails - - name: Set up vcpkg (Fallback) - if: runner.os == 'Windows' && steps.vcpkg_setup.outcome == 'failure' - uses: lukka/run-vcpkg@v11 - with: - vcpkgGitCommitId: '2024.01.12' - runVcpkgInstall: true - vcpkgJsonGlob: '**/vcpkg.json.backup' - vcpkgDirectory: '${{ github.workspace }}/vcpkg' - env: - VCPKG_FORCE_SYSTEM_BINARIES: 1 - VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - - # Install dependencies manually if vcpkg fails completely + # Install dependencies manually if vcpkg fails - name: Install dependencies manually (Windows) if: runner.os == 'Windows' && steps.vcpkg_setup.outcome == 'failure' shell: pwsh diff --git a/vcpkg.json.backup b/vcpkg.json.backup deleted file mode 100644 index ac62f41c..00000000 --- a/vcpkg.json.backup +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "yaze", - "version": "0.3.1", - "description": "Yet Another Zelda3 Editor", - "dependencies": [ - { - "name": "zlib", - "platform": "!uwp" - }, - { - "name": "libpng", - "platform": "!uwp" - }, - { - "name": "sdl2", - "platform": "!uwp", - "features": ["vulkan"] - }, - { - "name": "abseil", - "platform": "!uwp" - } - ], - "builtin-baseline": "2024.01.12", - "overrides": [ - { - "name": "abseil", - "version": "20240116.2" - } - ] -}