Skip to content

Commit 85aa8c6

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

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/docker/linux/tox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN --mount=type=cache,target=${UV_CACHE_DIR} \
5555
cp ${CONAN_HOME}/remotes.json /tmp/remotes.json && \
5656
uv run --only-group=conan conan remote update conan-center --url ${CONAN_CENTER_PROXY_V2_URL}; \
5757
fi && \
58-
uv run --only-group=conan conan install /tmp --build missing --build=openjpeg && \
58+
uv run --only-group=conan conan install /tmp --build missing -c tools.graph:skip_test=True && \
5959
uv run --only-group=conan conan cache clean "*" -b --source --build --temp && \
6060
rm -rf venv && \
6161
if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \

scripts/resources/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN uv run --only-group conan --with ninja conan profile detect --exist-ok ; `
8282
Copy-Item -Path "${Env:CONAN_HOME}\remotes.json" -Destination "c:\remotes.json" ; `
8383
uv run --only-group conan --with ninja conan remote update conan-center --url ${env:CONAN_CENTER_PROXY_V2_URL}; `
8484
}; `
85-
uv run --only-group conan --with ninja conan install c:/temp/ --build missing -pr:b=default --conf=tools.cmake.cmaketoolchain:generator=Ninja ; `
85+
uv run --only-group conan --with ninja conan install c:/temp/ --build missing -pr:b=default --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.graph:skip_test=True ; `
8686
if ($LASTEXITCODE -ne 0) { `
8787
throw \"Command 'conan install' failed with exit code: $LASTEXITCODE\"`
8888
} ;`

0 commit comments

Comments
 (0)