From 5993bc9d1ce7739b84d073bf00dda43ab172aa5d Mon Sep 17 00:00:00 2001 From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:54:56 +0800 Subject: [PATCH] opt: vcpkg manifest error (#1565) * opt: vcpkg manifest error * opt: seperate breadpad into feature * fix: vcpkg manifest mode --- .github/workflows/windows-6.x.yml | 8 ++++++-- vcpkg.json | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml index 23dd056a..a180cfca 100644 --- a/.github/workflows/windows-6.x.yml +++ b/.github/workflows/windows-6.x.yml @@ -140,12 +140,16 @@ jobs: echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt cat version.txt echo "$version" - + # rename the vcpkg.json. with this file existed,the vcpkg action will fall to manifest mode + - name: remove vcpkg.json + shell: bash + run: | + mv vcpkg.json vcpkg.json.bak - name: vcpkg build uses: johnwason/vcpkg-action@v6 id: vcpkg with: - # pkgs: ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl] breakpad + #manifest-dir: ${{ github.workspace }} pkgs: breakpad triplet: x64-windows-release token: ${{ github.token }} diff --git a/vcpkg.json b/vcpkg.json index a471199d..9aa2f7d2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -13,5 +13,11 @@ "xapian", "zlib", "openssl" - ] + ], + "features": { + "breakpad": { + "description": "enable breakpad crash reporting", + "dependencies": [ "breakpad" ] + } + } }