Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 12 additions & 29 deletions .github/workflows/docker-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,18 @@ jobs:
--version ${{ matrix.common_version_noclang }} \
--push NO

- name: Build common wrappers (Conan)
run: |
set -ex
uv run aswfdocker \
--verbose \
build \
--ci-image-type PACKAGE \
--group common-wrappers \
--version ${{ matrix.common_version_noclang }} \
--build-missing \
--push NO

- name: Build Ninja and CMake (Conan)
run: |
set -ex
Expand All @@ -97,7 +109,6 @@ jobs:
--ci-image-type PACKAGE \
--group common \
--version ${{ matrix.common_version_noclang }} \
--use-conan \
--build-missing \
--target ninja \
--target cmake \
Expand All @@ -112,7 +123,6 @@ jobs:
--ci-image-type PACKAGE \
--group common \
--version ${{ matrix.common_version }} \
--use-conan \
--build-missing \
--target clang \
--push NO
Expand All @@ -136,7 +146,6 @@ jobs:
--ci-image-type PACKAGE \
--group base1-wrappers \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -149,7 +158,6 @@ jobs:
--ci-image-type PACKAGE \
--group base1-1 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -162,7 +170,6 @@ jobs:
--ci-image-type PACKAGE \
--group base1-2 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -175,7 +182,6 @@ jobs:
--ci-image-type PACKAGE \
--group base1-3 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -188,7 +194,6 @@ jobs:
--ci-image-type PACKAGE \
--group base2-wrappers \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -201,7 +206,6 @@ jobs:
--ci-image-type PACKAGE \
--group base2-1
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -214,7 +218,6 @@ jobs:
--ci-image-type PACKAGE \
--group base2-2 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -227,7 +230,6 @@ jobs:
--ci-image-type PACKAGE \
--group base3 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -251,7 +253,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-wrappers \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -264,7 +265,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-1 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -277,7 +277,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-2 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -290,7 +289,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-3 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -303,7 +301,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-4 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -316,7 +313,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-5 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

Expand All @@ -329,19 +325,6 @@ jobs:
--ci-image-type PACKAGE \
--group vfx1-6 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing \
--push NO

- name: Build vfx2 non-Conan packages
run: |
set -ex
uv run aswfdocker \
--verbose \
build \
--ci-image-type PACKAGE \
--group vfx2 \
--version ${{ matrix.version_noclang }} \
--build-missing \
--push NO

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: "3.9"
python-version: "3.10"

- name: Install uv
uses: astral-sh/setup-uv@e06108dd0aef18192324c70427afc47652e63a82 # v7.5.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: "3.9"
python-version: "3.10"

- name: Install uv
uses: astral-sh/setup-uv@e06108dd0aef18192324c70427afc47652e63a82 # v7.5.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
build: true
push_description: true
- group: conan
args: --use-conan
args: ""
build: ${{ contains(github.ref, '/ci-package') }}
push_description: false

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repos:
hooks:
# Don't reformat vendored Conan recipes
- id: black
language_version: python3.9
language_version: python3.10
exclude: packages/conan/recipes/
- repo: local
hooks:
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

All notable changes to this project will be documented in this file.

# 2026-03-31

- All releases
- [OpenTimelineIO now built as a Conan package](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/231)
- we previously weren't actually building the C++ components of OTIO, just installing Python prerequisites
- for now we only build the C++ libraries, need to resolve issue of installation location to also build Python module
- aswfdocker cleanup
- since all packages are now built as Conan packages, we remove obsolete support for building packages as container images
- `aswfdocker build -c / --use-conan` emits a warning about being deprecated
- `aswfdocker migrate` and `aswfdocker download` emit a warning about being deprecated
- minimum Python version to run aswfdocker is now Python 3.10, needed for Click 8.3.1
- [CMake built with SSL support](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/326), can download from https://
- 2026.x (no new container image release yet)
- [OTIO 0.17.0 to 0.18.1](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/313)

# 2026-03-23

OpenUSD updates and Conan package.
Expand Down
10 changes: 2 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,7 @@ Unfortunately there is duplication between the version information in
When a sufficiently recent package is provided by the underlying OS distribution, packages labeled as version `system` are created which are thin wrappers around system installed components, and the Conan profile is used to remap `requires()`
call to specific versions to these wrapper packages. Confusingly some will have an actual version number since some dependent packages check for acceptable version ranges. A better versioning scheme would be desirable for these wrapper packages.

To test locally, use the `aswfdocker build` command with the `--use-conan` argument.
The `--keep-source` and `--keep-build` can help when iterating on the build recipe to
avoid re-downloading the source, and even keep the previous build artifact.
All regular aswfdocker commands and options work the same with conan or docker packages.

You can use the `aswfdocker conandiff` command to view updates in the upstream Conan Center Index recipes since the last time the local copy was updated. This requires the `From: https://...` header comment to be updated correctly.
You can use the `aswfdocker conandiff` command to view updates in the upstream Conan Center Index recipes since the last time the local copy was updated. This requires the `From: https://...` header comment to be updated correctly in our vendored copies of the CCI recipes.

```
$ aswfdocker conandiff
Expand Down Expand Up @@ -392,7 +387,7 @@ at the end of the `versions.yaml` file, see `gtest` as an example.

### Peeking into the Conan cache

When building a Conan package, `aswfdocker build --use-conan` uses [common/packages/Dockerfile](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/common/Dockerfile) which uses a
When building a Conan package, `aswfdocker build` uses [common/packages/Dockerfile](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/packages/common/Dockerfile) which uses a
[Docker Cache Mount](https://docs.docker.com/build/cache/optimize/#use-cache-mounts) to store the persistent
cache of local Conan package builds (similarly for the [ccache](https://ccache.dev/) persistent cache):

Expand Down Expand Up @@ -654,7 +649,6 @@ aswfdocker release -t PACKAGE -g vfx1-3 -v 2024 -v 2025 -v 2026 --docker-org asw
aswfdocker release -t PACKAGE -g vfx1-4 -v 2024 -v 2025 -v 2026 --docker-org aswf -m "RELEASE_NOTES!"
aswfdocker release -t PACKAGE -g vfx1-5 -v 2024 -v 2025 -v 2026 --docker-org aswf -m "RELEASE_NOTES!"
aswfdocker release -t PACKAGE -g vfx1-6 -v 2024 -v 2025 -v 2026 --docker-org aswf -m "RELEASE_NOTES!"
aswfdocker release -t PACKAGE -g vfx2 -v 2024 -v 2025 -v 2026 --docker-org aswf -m "RELEASE_NOTES!"

# Finally build the CI images
aswfdocker release -t IMAGE -g base -v 2024 -v 2025 -v 2026 --docker-org aswf -m "RELEASE_NOTES!"
Expand Down
6 changes: 5 additions & 1 deletion ci-base/Dockerfile

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

3 changes: 3 additions & 0 deletions ci-base/README.md

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

1 change: 1 addition & 0 deletions ci-base/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ packages:
- lz4
- pugixml
- pystring
- rapidjson
- snappy
- onetbb
- tsl-robin-map
Expand Down
1 change: 0 additions & 1 deletion ci-baseos-gl-conan/Dockerfile

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

1 change: 0 additions & 1 deletion ci-baseqt/Dockerfile

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

1 change: 0 additions & 1 deletion ci-common/Dockerfile

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

1 change: 0 additions & 1 deletion ci-imath/Dockerfile

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

1 change: 0 additions & 1 deletion ci-materialx/Dockerfile

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

1 change: 0 additions & 1 deletion ci-ocio/Dockerfile

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

1 change: 0 additions & 1 deletion ci-oiio/Dockerfile

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

1 change: 0 additions & 1 deletion ci-opencue/Dockerfile

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

Loading
Loading