From c7259d2d97604e105721ec3f03d745d3945f778e Mon Sep 17 00:00:00 2001 From: YiFang Xiao Date: Fri, 8 Sep 2023 00:28:50 +0800 Subject: [PATCH] action: vcpkg --- .github/workflows/macos-homebrew.yml | 12 +----------- .github/workflows/windows-6.x.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 8e0bb0f1..3cf1a70b 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -94,17 +94,7 @@ jobs: echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt cat version.txt echo "$version" - - - name: vcpkg install - shell: bash - run: | - vcpkg install breakpad - - name: copy vcpkg packages into winlibs - shell: bash - run: | - ls -al /usr/local/share/vcpkg/packages/breakpad* - cp -R /usr/local/share/vcpkg/packages/breakpad*/* thirdparty/breakpad - ls -al thirdparty/breakpad/lib + - name: Install Qt uses: jurplel/install-qt-action@v3 with: diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml index 193e1e67..8f3fe67d 100644 --- a/.github/workflows/windows-6.x.yml +++ b/.github/workflows/windows-6.x.yml @@ -129,13 +129,13 @@ jobs: cat version.txt echo "$version" - - name: vcpkg install - shell: powershell - run: | - git clone --depth 1 https://github.com/microsoft/vcpkg.git - .\vcpkg\bootstrap-vcpkg.bat - # .\vcpkg\vcpkg.exe install ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl] --triplet=x64-windows-release - .\vcpkg\vcpkg.exe install breakpad --triplet=x64-windows-release + - name: vcpkg build + uses: johnwason/vcpkg-action@v5 + id: vcpkg + with: + pkgs: ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl] breakpad + triplet: x64-windows-release + token: ${{ github.token }} - name: copy vcpkg packages into winlibs shell: bash run: |