Skip to content

Commit fa040f2

Browse files
authored
Merge pull request DOCGroup#173 from jwillemsen/jwi-runvcpkgv10
Upgrade to run-vcpkg v10
2 parents 55ac3ab + fe3a444 commit fa040f2

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

.github/workflows/windows.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ jobs:
2727
BuildConfiguration: Debug
2828
vcpkgarch: x64-windows
2929
vcpkglibdir: debug/lib
30-
vcpkgpackages: openssl xerces-c zlib
30+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
3131
- name: VS2019Release32
3232
vmimage: windows-2019
3333
mpctype: vs2019
3434
BuildPlatform: Win32
3535
BuildConfiguration: Release
3636
vcpkgarch: x86-windows
3737
vcpkglibdir: lib
38-
vcpkgpackages: openssl xerces-c zlib
38+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
3939
- name: VS2022Debug64
4040
vmimage: windows-2022
4141
mpctype: vs2022
4242
BuildPlatform: x64
4343
BuildConfiguration: Debug
4444
vcpkgarch: x64-windows
4545
vcpkglibdir: debug/lib
46-
vcpkgpackages: openssl xerces-c zlib
46+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
4747
- name: VS2022Release32
4848
vmimage: windows-2022
4949
mpctype: vs2022
5050
BuildPlatform: Win32
5151
BuildConfiguration: Release
5252
vcpkgarch: x86-windows
5353
vcpkglibdir: lib
54-
vcpkgpackages: openssl xerces-c zlib
54+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
5555
runs-on: ${{ matrix.vmimage }}
5656
name: ${{ matrix.name }}
5757
env:
@@ -60,12 +60,14 @@ jobs:
6060
TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO
6161
MPC_ROOT: ${{ github.workspace }}/
6262
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
63-
XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
64-
XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
65-
SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
66-
SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
67-
ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
68-
ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
63+
XERCESC_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include
64+
XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
65+
SSL_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include
66+
SSL_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
67+
ZLIB_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include
68+
ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
69+
VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkgarch }}
70+
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
6971
steps:
7072
- name: checkout MPC
7173
uses: actions/checkout@v3
@@ -74,13 +76,16 @@ jobs:
7476
with:
7577
repository: DOCGroup/ACE_TAO
7678
path: ${{ env.DOC_ROOT }}
79+
- name: create vcpkg.json
80+
run: |
81+
'{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json
82+
shell: pwsh
7783
- name: Install vcpkg
78-
uses: lukka/run-vcpkg@v7
84+
uses: lukka/run-vcpkg@v10
7985
with:
80-
vcpkgGitCommitId: b86c0c35b88e2bf3557ff49dc831689c2f085090
81-
vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }}
82-
vcpkgTriplet: ${{ matrix.vcpkgarch }}
86+
vcpkgGitCommitId: 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46
8387
appendedCacheKey: ${{ matrix.name }}
88+
runVcpkgInstall: true
8489
- name: create $ACE_ROOT/ace/config.h
8590
run: |
8691
'#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h

0 commit comments

Comments
 (0)