Skip to content

Commit eb7e730

Browse files
committed
Fix conan quoting and update Conan to 2.26.2
- Update Conan build version to 2.26.2 to match aswfdocker version. - Fix quoting in packages/conan/Dockerfile to avoid passing empty strings to `conan create` command line. Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
1 parent d9f808f commit eb7e730

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
55
# 2026-03-14
66

77
- All releases
8+
- Conan 2.18.1 to 2.26.2
89
- [Replace Pipenv with uv](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/269) for Python dependency management; use `uv sync --all-extras` and `uv run` (see `python/README.md`). Lockfile is `uv.lock`; dependencies are in `pyproject.toml` [project].
910
- Update GitHub action versions for [NodeJS 24](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/350)
1011
- Update some Python dependencies

ci-baseos-gl-conan/README.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-common/README.md

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/common/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \
137137
--mount=type=bind,rw,target=${ASWF_CONAN_HOME}/.conan2,source=packages/conan/settings \
138138
--mount=type=bind,rw,target=${ASWF_CONAN_HOME}/recipes,source=packages/conan/recipes \
139139
conan create \
140-
"${ASWF_CONAN_BUILD_MISSING}" \
141-
"${ASWF_CONAN_NO_REMOTE}" \
140+
${ASWF_CONAN_BUILD_MISSING} \
141+
${ASWF_CONAN_NO_REMOTE} \
142142
--profile:all "${ASWF_CONAN_HOME}"/.conan2/profiles_"${ASWF_PKG_ORG}"/"${ASWF_CONAN_CHANNEL}" \
143143
--name "${ASWF_PKG_NAME}" \
144144
--version "${ASWF_PKG_VERSION}" \
145145
--user "${ASWF_PKG_ORG}" \
146146
--channel "${ASWF_CONAN_CHANNEL}" \
147-
"${ASWF_PKG_DIR}"/$(if [ -f "${ASWF_PKG_YML}" ] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' "${ASWF_PKG_YML}" ; fi)
147+
"${ASWF_PKG_DIR}"/$(if [[ -f "${ASWF_PKG_YML}" ]] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' "${ASWF_PKG_YML}" ; fi)
148148

149149
# Upload build to repository if called for
150150
RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \

python/aswfdocker/data/versions.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ versions:
149149
package_versions:
150150
ASWF_DTS_VERSION: "11"
151151
ASWF_DTS_PREFIX: "gcc-toolset"
152-
ASWF_CONAN_VERSION: "2.18.1"
152+
ASWF_CONAN_VERSION: "2.26.2"
153153
ASWF_CONAN_PYTHON_VERSION: "3.11.11"
154154
ASWF_CUDA_VERSION: "12.6.3"
155155
ASWF_OPTIX_VERSION: "8.0.0"
@@ -184,7 +184,7 @@ versions:
184184
package_versions:
185185
ASWF_DTS_VERSION: "11"
186186
ASWF_DTS_PREFIX: "gcc-toolset"
187-
ASWF_CONAN_VERSION: "2.18.1"
187+
ASWF_CONAN_VERSION: "2.26.2"
188188
ASWF_CONAN_PYTHON_VERSION: "3.11.11"
189189
ASWF_CUDA_VERSION: "12.6.3"
190190
ASWF_OPTIX_VERSION: "8.0.0"
@@ -220,7 +220,7 @@ versions:
220220
package_versions:
221221
ASWF_DTS_VERSION: "14"
222222
ASWF_DTS_PREFIX: "gcc-toolset"
223-
ASWF_CONAN_VERSION: "2.18.1"
223+
ASWF_CONAN_VERSION: "2.26.2"
224224
ASWF_CONAN_PYTHON_VERSION: "3.13.3"
225225
ASWF_CUDA_VERSION: "12.9.1"
226226
ASWF_OPTIX_VERSION: "8.0.0"

0 commit comments

Comments
 (0)