Skip to content

Commit b5fe346

Browse files
committed
build: catch2 is installed with using conan instead of FetchContent
1 parent d1984a4 commit b5fe346

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

scripts/resources/windows/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,11 @@ RUN New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" `
6565
FROM chocolatey_base AS conan_builder
6666
ARG CONAN_HOME
6767

68-
ARG PIP_INDEX_URL
69-
ARG PIP_EXTRA_INDEX_URL
7068
ARG UV_INDEX_URL
7169
ARG UV_EXTRA_INDEX_URL
7270
ENV UV_PROJECT=c:/temp/uv
7371
ENV UV_PROJECT_ENVIRONMENT=c:\temp\uv\.venv
74-
COPY conanfile.py c:/temp/conanfile.py
75-
COPY pyproject.toml uv.lock conan.lock ${UV_PROJECT}/
72+
COPY pyproject.toml uv.lock conan.lock conanfile.py ${UV_PROJECT}/
7673
COPY scripts/resources/windows/conan/profile.ini ${CONAN_HOME}/profiles/default
7774
COPY ci/docker/shared/conan/remotes.json ${CONAN_HOME}/remotes.json
7875

@@ -83,7 +80,7 @@ RUN uv run --only-group conan --with ninja conan profile detect --exist-ok ; `
8380
Copy-Item -Path "${Env:CONAN_HOME}\remotes.json" -Destination "c:\remotes.json" ; `
8481
uv run --only-group conan --with ninja conan remote update conan-center --url ${env:CONAN_CENTER_PROXY_V2_URL}; `
8582
}; `
86-
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; `
83+
uv run --only-group conan --with ninja conan install ${env:UV_PROJECT}/conanfile.py --build missing -pr:b=default --conf=tools.cmake.cmaketoolchain:generator=Ninja -c tools.build:skip_test=True -c tools.graph:skip_test=True ; `
8784
if ($LASTEXITCODE -ne 0) { `
8885
throw \"Command 'conan install' failed with exit code: $LASTEXITCODE\"`
8986
} ;`

0 commit comments

Comments
 (0)