@@ -27,31 +27,31 @@ jobs:
27
27
BuildConfiguration : Debug
28
28
vcpkgarch : x64-windows
29
29
vcpkglibdir : debug/lib
30
- vcpkgpackages : openssl xerces-c zlib
30
+ vcpkgpackages : ' " openssl", " xerces-c", " zlib" '
31
31
- name : VS2019Release32
32
32
vmimage : windows-2019
33
33
mpctype : vs2019
34
34
BuildPlatform : Win32
35
35
BuildConfiguration : Release
36
36
vcpkgarch : x86-windows
37
37
vcpkglibdir : lib
38
- vcpkgpackages : openssl xerces-c zlib
38
+ vcpkgpackages : ' " openssl", " xerces-c", " zlib" '
39
39
- name : VS2022Debug64
40
40
vmimage : windows-2022
41
41
mpctype : vs2022
42
42
BuildPlatform : x64
43
43
BuildConfiguration : Debug
44
44
vcpkgarch : x64-windows
45
45
vcpkglibdir : debug/lib
46
- vcpkgpackages : openssl xerces-c zlib
46
+ vcpkgpackages : ' " openssl", " xerces-c", " zlib" '
47
47
- name : VS2022Release32
48
48
vmimage : windows-2022
49
49
mpctype : vs2022
50
50
BuildPlatform : Win32
51
51
BuildConfiguration : Release
52
52
vcpkgarch : x86-windows
53
53
vcpkglibdir : lib
54
- vcpkgpackages : openssl xerces-c zlib
54
+ vcpkgpackages : ' " openssl", " xerces-c", " zlib" '
55
55
runs-on : ${{ matrix.vmimage }}
56
56
name : ${{ matrix.name }}
57
57
env :
@@ -60,12 +60,14 @@ jobs:
60
60
TAO_ROOT : ${{ github.workspace }}/ACE_TAO/TAO
61
61
MPC_ROOT : ${{ github.workspace }}/
62
62
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
69
71
steps :
70
72
- name : checkout MPC
71
73
uses : actions/checkout@v3
@@ -74,13 +76,16 @@ jobs:
74
76
with :
75
77
repository : DOCGroup/ACE_TAO
76
78
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
77
83
- name : Install vcpkg
78
- uses : lukka/run-vcpkg@v7
84
+ uses : lukka/run-vcpkg@v10
79
85
with :
80
- vcpkgGitCommitId : b86c0c35b88e2bf3557ff49dc831689c2f085090
81
- vcpkgArguments : --recurse ${{ matrix.vcpkgpackages }}
82
- vcpkgTriplet : ${{ matrix.vcpkgarch }}
86
+ vcpkgGitCommitId : 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46
83
87
appendedCacheKey : ${{ matrix.name }}
88
+ runVcpkgInstall : true
84
89
- name : create $ACE_ROOT/ace/config.h
85
90
run : |
86
91
'#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h
0 commit comments