build: catch2 is installed with using conan instead of FetchContent

Author: henryborchers

ci/docker/linux/jenkins/Dockerfile

@@ -143,4 +143,7 @@ ENV CONAN_USER_HOME=${CONAN_USER_HOME}
 ARG CONAN_HOME
 ENV CONAN_HOME=${CONAN_HOME}
 COPY --from=conan_builder --chmod=777 ${CONAN_HOME} ${CONAN_HOME}
-ENV TZ=UTC
+ENV TZ=UTC
+
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci

ci/docker/linux/tox/Dockerfile

@@ -79,3 +79,5 @@ RUN mkdir -p ${PIP_DOWNLOAD_CACHE} && \
     mkdir -p ${UV_CACHE_DIR} && \
     chmod -R 777 ${UV_CACHE_DIR}
 
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci

scripts/resources/package_for_linux/Dockerfile

@@ -95,4 +95,8 @@ RUN chmod -R 777 ${CONAN_HOME} && \
     chmod -R 777 ${PIP_DOWNLOAD_CACHE} && \
     mkdir -p ${UV_CACHE_DIR} && \
     chmod -R 777 ${UV_CACHE_DIR}
-LABEL type="jenkins"
+
+LABEL type="jenkins"
+
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci

scripts/resources/windows/Dockerfile

@@ -70,6 +70,7 @@ ARG PIP_EXTRA_INDEX_URL
 ARG UV_INDEX_URL
 ARG UV_EXTRA_INDEX_URL
 ENV UV_PROJECT=c:/temp/uv
+ENV UV_PROJECT_ENVIRONMENT=c:\temp\uv.venv
 COPY conanfile.py c:/temp/conanfile.py
 COPY pyproject.toml uv.lock conan.lock ${UV_PROJECT}/
 COPY scripts/resources/windows/conan/profile.ini ${CONAN_HOME}/profiles/default
@@ -82,12 +83,12 @@ RUN uv run --only-group conan --with ninja conan profile detect --exist-ok ; `
           Copy-Item -Path "${Env:CONAN_HOME}\remotes.json" -Destination "c:\remotes.json" ; `
           uv run --only-group conan --with ninja conan remote update conan-center --url ${env:CONAN_CENTER_PROXY_V2_URL}; `
     }; `
-    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 ; `
+    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 -c tools.build:skip_test; `
     if ($LASTEXITCODE -ne 0) { `
           throw \"Command 'conan install' failed with exit code: $LASTEXITCODE\"`
     } ;`
     uv run --only-group conan --with ninja conan cache clean "*" -b --source --build --temp ; `
-    Remove-Item -Path \"${Env:UV_PROJECT}\\.venv\" -Recurse -Force ; `
+    Remove-Item -Path \"${Env:UV_PROJECT_ENVIRONMENT}\" -Recurse -Force ; `
     uv cache clean --no-progress ; `
     if (${env:CONAN_CENTER_PROXY_V2_URL} -ne $(Get-Content -Raw -Path ${Env:CONAN_HOME}\remotes.json)) { `
       Move-Item -Path "c:\remotes.json" -Destination "${Env:CONAN_HOME}\remotes.json" -Force ;`
@@ -114,3 +115,5 @@ ENV CONAN_USER_HOME=${CONAN_USER_HOME}`
     UV_CACHE_DIR=${UV_CACHE_DIR}`
     PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}
 
+# To help mark the image as a CI image so it can be cleaned up more easily
+LABEL purpose=ci