Skip to content

Commit a2b3c32

Browse files
committed
Use vcpkg manifest
1 parent 20fed05 commit a2b3c32

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

.github/workflows/vcpkg.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,7 @@ jobs:
9292
echo "VCPKG_INSTALLATION_ROOT=$VCPKG_BASH_PATH" >> "$GITHUB_ENV"
9393
9494
- name: "Install dependencies"
95-
run: >
96-
vcpkg x-set-installed --triplet ${{ matrix.triplet }} --host-triplet ${{ matrix.triplet }}
97-
boost-assign
98-
boost-bimap
99-
boost-chrono
100-
boost-date-time
101-
boost-filesystem
102-
boost-format
103-
boost-graph
104-
boost-math
105-
boost-program-options
106-
boost-regex
107-
boost-serialization
108-
boost-system
109-
boost-thread
110-
boost-timer
111-
tbb
112-
pybind11
113-
geographiclib
95+
run: vcpkg install --triplet ${{ matrix.triplet }} --host-triplet ${{ matrix.triplet }}
11496

11597
- name: On Failure, upload vcpkg logs
11698
if: failure()
@@ -123,9 +105,8 @@ jobs:
123105
- name: copy files for hash
124106
shell: bash
125107
run: |
126-
echo $VCPKG_INSTALLATION_ROOT
127108
mkdir -p vcpkg-info
128-
find $VCPKG_INSTALLATION_ROOT/installed/ -type f -name 'vcpkg_abi_info.txt' | \
109+
find vcpkg_installed/ -type f -name 'vcpkg_abi_info.txt' | \
129110
while read filepath; do
130111
triplet=$(echo "$filepath" | awk -F/ '{print $(NF-3)}')
131112
port=$(echo "$filepath" | awk -F/ '{print $(NF-1)}')
@@ -143,8 +124,8 @@ jobs:
143124
- name: Install python packages
144125
shell: bash
145126
run: |
146-
$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m ensurepip --upgrade
147-
$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m pip install -r python/dev_requirements.txt
127+
vcpkg_installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m ensurepip --upgrade
128+
vcpkg_installed/${{ matrix.triplet }}/tools/python3/${{ matrix.python }} -m pip install -r python/dev_requirements.txt
148129
149130
- name: Set Swap Space (Linux)
150131
if: runner.os == 'Linux'
@@ -160,7 +141,7 @@ jobs:
160141
161142
cmake . -B build -G Ninja \
162143
-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake \
163-
-DVCPKG_INSTALLED_DIR=$VCPKG_INSTALLATION_ROOT/installed \
144+
-DVCPKG_INSTALLED_DIR=$RUNNER_WORKSPACE/vcpkg_installed \
164145
-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
165146
-DVCPKG_HOST_TRIPLET=${{ matrix.triplet }} \
166147
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
@@ -188,7 +169,7 @@ jobs:
188169
- name: Run Python tests
189170
shell: bash
190171
run: |
191-
export PATH="$PATH:$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/bin"
172+
export PATH="$PATH:$RUNNER_WORKSPACE/vcpkg_installed/${{ matrix.triplet }}/bin"
192173
cmake --build build --target python-install
193174
cmake --build build --target python-test
194175
cmake --build build --target python-test-unstable

vcpkg.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"dependencies": [
3+
"boost-assign",
4+
"boost-bimap",
5+
"boost-chrono",
6+
"boost-date-time",
7+
"boost-filesystem",
8+
"boost-format",
9+
"boost-graph",
10+
"boost-math",
11+
"boost-program-options",
12+
"boost-regex",
13+
"boost-serialization",
14+
"boost-system",
15+
"boost-thread",
16+
"boost-timer",
17+
"tbb",
18+
"pybind11",
19+
"geographiclib"
20+
],
21+
"builtin-baseline": "74e6536215718009aae747d86d84b78376bf9e09"
22+
}

0 commit comments

Comments
 (0)