mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-12-05 00:24:06 +00:00
Merge branch 'action/vcpkg'
This commit is contained in:
commit
216505c914
12
.github/workflows/macos-homebrew.yml
vendored
12
.github/workflows/macos-homebrew.yml
vendored
|
@ -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:
|
||||
|
|
14
.github/workflows/windows-6.x.yml
vendored
14
.github/workflows/windows-6.x.yml
vendored
|
@ -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: |
|
||||
|
|
Loading…
Reference in a new issue