Skip to content

Commit 1958ff5

Browse files
committed
feat: support conan.lock
1 parent 628ad41 commit 1958ff5

File tree

6 files changed

+15
-2
lines changed

6 files changed

+15
-2
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include cmake/fixup.cmake
99

1010
# C++ Source files
1111
include CMakeLists.txt
12-
include conanfile.py
12+
include conanfile.py conan.lock
1313
recursive-include src/uiucprescon/imagevalidate CMakeLists.txt *.cpp *.h
1414

1515
# Tox configuration setting

ci/docker/linux/jenkins/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
9595
--mount=type=bind,source=pyproject.toml,target=${UV_PROJECT}/pyproject.toml \
9696
--mount=type=bind,source=uv.lock,target=${UV_PROJECT}/uv.lock \
9797
--mount=type=bind,source=conanfile.py,target=/tmp/conanfile.py \
98+
--mount=type=bind,source=conan.lock,target=${UV_PROJECT}/conan.lock \
9899
--mount=type=tmpfs,target=${UV_PROJECT_ENVIRONMENT} \
99100
uv run --only-group=conan conan profile detect --exist-ok && \
100101
if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \

ci/docker/linux/tox/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ RUN --mount=type=cache,target=${UV_CACHE_DIR} \
4646
--mount=type=bind,source=pyproject.toml,target=${UV_PROJECT}/pyproject.toml \
4747
--mount=type=bind,source=uv.lock,target=${UV_PROJECT}/uv.lock \
4848
--mount=type=bind,source=conanfile.py,target=/tmp/conanfile.py \
49+
--mount=type=bind,source=conan.lock,target=${UV_PROJECT}/conan.lock \
4950
uv run --only-group=conan conan profile detect --exist-ok && \
5051
cat $(uv run --only-group=conan conan config home)/settings.yml && \
5152
uv run --only-group=conan conan config home && \

conan.lock

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"version": "0.5",
3+
"requires": [
4+
"openjpeg/2.3.1#ada21840f723c5410056aa68f0b23c61%1765835638.220325"
5+
],
6+
"build_requires": [],
7+
"python_requires": [],
8+
"config_requires": []
9+
}

scripts/resources/package_for_linux/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ RUN --mount=type=cache,target=${PIP_DOWNLOAD_CACHE} \
6969
--mount=type=bind,source=pyproject.toml,target=${UV_PROJECT}/pyproject.toml \
7070
--mount=type=bind,source=uv.lock,target=${UV_PROJECT}/uv.lock \
7171
--mount=type=bind,source=conanfile.py,target=/tmp/conanfile.py \
72+
--mount=type=bind,source=conan.lock,target=/tmp/conan.lock \
7273
uv run --only-group conan --with ninja conan profile detect --exist-ok && \
7374
if [ "$(jq -r '.remotes[0].url' ${CONAN_HOME}/remotes.json )" != "${CONAN_CENTER_PROXY_V2_URL}" ]; then \
7475
echo "Setting the conan center url for building cache: ${CONAN_CENTER_PROXY_V2_URL}" && \

scripts/resources/windows/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ ARG UV_INDEX_URL
7171
ARG UV_EXTRA_INDEX_URL
7272
ENV UV_PROJECT=c:/temp/uv
7373
COPY conanfile.py c:/temp/conanfile.py
74-
COPY pyproject.toml uv.lock ${UV_PROJECT}/
74+
COPY pyproject.toml uv.lock conan.lock ${UV_PROJECT}/
7575
COPY scripts/resources/windows/conan/profile.ini ${CONAN_HOME}/profiles/default
7676
COPY ci/docker/shared/conan/remotes.json ${CONAN_HOME}/remotes.json
77+
7778
ARG CONAN_CENTER_PROXY_V2_URL
7879
ENV UV_FROZEN=1
7980
RUN uv run --only-group conan --with ninja conan profile detect --exist-ok ; `

0 commit comments

Comments
 (0)