Skip to content

Commit 4b473d3

Browse files
committed
ci: Dockerfiles no longer retain conan remotes used by CONAN_CENTER_PROXY_V2_URL variable
1 parent 3bb0b37 commit 4b473d3

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

ci/docker/linux/jenkins/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
108108
fi && \
109109
uv run --only-group=conan conan install /tmp --build missing -pr:b=default && \
110110
uv run --only-group=conan conan cache clean "*" -b --source --build --temp && \
111-
if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
111+
if [ -f "/tmp/remotes.json" ]; then \
112112
mv -f /tmp/remotes.json ${CONAN_HOME}/remotes.json; \
113113
fi
114114

ci/docker/linux/tox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN --mount=type=cache,target=${UV_CACHE_DIR} \
5858
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 && \
61-
if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
61+
if [ -f "/tmp/remotes.json" ]; then \
6262
mv -f /tmp/remotes.json ${CONAN_HOME}/remotes.json; \
6363
fi
6464
# ==============================================================================

scripts/resources/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN uv run --only-group conan --with ninja conan profile detect --exist-ok ; `
7272
uv run --only-group conan --with ninja conan cache clean "*" -b --source --build --temp ; `
7373
Remove-Item -Path \"${Env:UV_PROJECT_ENVIRONMENT}\" -Recurse -Force ; `
7474
uv cache clean --no-progress ; `
75-
if (${env:CONAN_CENTER_PROXY_V2_URL} -ne $(Get-Content -Raw -Path ${Env:CONAN_HOME}\remotes.json)) { `
75+
if (Test-Path -Path "c:\remotes.json") { `
7676
Move-Item -Path "c:\remotes.json" -Destination "${Env:CONAN_HOME}\remotes.json" -Force ;`
7777
}
7878
# ==============================================================================

0 commit comments

Comments
 (0)