Skip to content

Commit aaef7c8

Browse files
committed
build: catch2 is installed with using conan instead of FetchContent
1 parent 7076b4b commit aaef7c8

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

scripts/resources/package_for_linux/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ FROM ${manylinux_image} AS base
2626
RUN --mount=type=cache,target=/var/cache/yum \
2727
yum install -y lndir
2828

29-
# This needed to use uvx with --constraint option
30-
RUN --mount=type=cache,target=/path/to/pipx/cache \
31-
pipx install "uv>=0.6.5" --force
3229

3330
# ==============================================================================
3431
FROM base AS conan_builder
@@ -76,7 +73,7 @@ RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
7673
cp ${CONAN_HOME}/remotes.json /tmp/remotes.json && \
7774
uv run --only-group conan --with ninja conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
7875
fi && \
79-
uv run --only-group conan --with ninja conan install /tmp --build missing --conf=tools.cmake.cmaketoolchain:generator=Ninja && \
76+
uv run --only-group conan --with ninja conan install /tmp --build missing --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.graph:skip_test=True && \
8077
uv run --only-group conan --with ninja conan cache clean "*" -b --source --build --temp && \
8178
uv cache prune && \
8279
if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \

0 commit comments

Comments
 (0)