diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-21 13:20:53 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-21 21:04:52 +0200 |
commit | 296ed1c40bc0bf95738b71c1a893fe4eaa6396a1 (patch) | |
tree | e944b675863ee555d498c9291e50162f33e6c50c | |
parent | 7eac7289b4d042d6d76a2999fc6fa6cda764715a (diff) | |
download | ATCD-296ed1c40bc0bf95738b71c1a893fe4eaa6396a1.tar.gz |
Different way to setup and use vcpkg
* .github/workflows/windows.yml:
-rw-r--r-- | .github/workflows/windows.yml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ebd22c05beb..8f5d3ce2131 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,27 +96,18 @@ jobs: with: repository: DOCGroup/MPC path: MPC - - name: checkout vcpkg - uses: actions/checkout@v2 + - name: Install vcpkg + uses: lukka/run-vcpkg@v3 with: - repository: Microsoft/vcpkg - path: vcpkg - - name: Install additional packages using vcpkg + setupOnly: true + - name: Install vcpkg packages run: | - ${env:VCPKG_ROOT}\bootstrap-vcpkg.bat - ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${env:vcpkgarch} ${env:vcpkgpackages} + ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${matrix.vcpkgarch} ${matrix.vcpkgpackages} shell: pwsh - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU - run: | - 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - 'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - shell: pwsh - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features |