Skip to content

Fix conan quoting and update Conan to 2.26.2 #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfpanisset merged 1 commit into from
Mar 16, 2026
+16 −15
Merged

Fix conan quoting and update Conan to 2.26.2 #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
# 2026-03-14

- All releases
- Conan 2.18.1 to 2.26.2
- [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].
- Update GitHub action versions for [NodeJS 24](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/350)
- Update some Python dependencies
Expand Down
6 changes: 3 additions & 3 deletions ci-baseos-gl-conan/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ci-common/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/common/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \
--mount=type=bind,rw,target=${ASWF_CONAN_HOME}/.conan2,source=packages/conan/settings \
--mount=type=bind,rw,target=${ASWF_CONAN_HOME}/recipes,source=packages/conan/recipes \
conan create \
"${ASWF_CONAN_BUILD_MISSING}" \
"${ASWF_CONAN_NO_REMOTE}" \
${ASWF_CONAN_BUILD_MISSING} \
${ASWF_CONAN_NO_REMOTE} \
--profile:all "${ASWF_CONAN_HOME}"/.conan2/profiles_"${ASWF_PKG_ORG}"/"${ASWF_CONAN_CHANNEL}" \
--name "${ASWF_PKG_NAME}" \
--version "${ASWF_PKG_VERSION}" \
--user "${ASWF_PKG_ORG}" \
--channel "${ASWF_CONAN_CHANNEL}" \
"${ASWF_PKG_DIR}"/$(if [ -f "${ASWF_PKG_YML}" ] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' "${ASWF_PKG_YML}" ; fi)
"${ASWF_PKG_DIR}"/$(if [[ -f "${ASWF_PKG_YML}" ]] ; then yq '.versions["'"${ASWF_PKG_VERSION}"'"].folder' "${ASWF_PKG_YML}" ; fi)

# Upload build to repository if called for
RUN --mount=type=cache,target=${ASWF_CONAN_HOME}/d \
Expand Down
6 changes: 3 additions & 3 deletions python/aswfdocker/data/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ versions:
package_versions:
ASWF_DTS_VERSION: "11"
ASWF_DTS_PREFIX: "gcc-toolset"
ASWF_CONAN_VERSION: "2.18.1"
ASWF_CONAN_VERSION: "2.26.2"
ASWF_CONAN_PYTHON_VERSION: "3.11.11"
ASWF_CUDA_VERSION: "12.6.3"
ASWF_OPTIX_VERSION: "8.0.0"
Expand Down Expand Up @@ -184,7 +184,7 @@ versions:
package_versions:
ASWF_DTS_VERSION: "11"
ASWF_DTS_PREFIX: "gcc-toolset"
ASWF_CONAN_VERSION: "2.18.1"
ASWF_CONAN_VERSION: "2.26.2"
ASWF_CONAN_PYTHON_VERSION: "3.11.11"
ASWF_CUDA_VERSION: "12.6.3"
ASWF_OPTIX_VERSION: "8.0.0"
Expand Down Expand Up @@ -220,7 +220,7 @@ versions:
package_versions:
ASWF_DTS_VERSION: "14"
ASWF_DTS_PREFIX: "gcc-toolset"
ASWF_CONAN_VERSION: "2.18.1"
ASWF_CONAN_VERSION: "2.26.2"
ASWF_CONAN_PYTHON_VERSION: "3.13.3"
ASWF_CUDA_VERSION: "12.9.1"
ASWF_OPTIX_VERSION: "8.0.0"
Expand Down
Loading