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
101 changes: 38 additions & 63 deletions .github/workflows/docker-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
fail-fast: false
matrix:
include:
- group: vfx-2025
name: vfx-2025
common_version: 5-clang18
common_version_noclang: 5
version: 2025-clang18
version_noclang: 2025
- group: vfx-2026
name: vfx-2026
common_version: 6-clang20
common_version_noclang: 6
version: 2026-clang20
version_noclang: 2026
test: ""

steps:
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Free up disk space
run: |
df -h
sudo apt-get remove -y '^llvm-.*' 'php.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
sudo apt-get remove -y '^llvm-.*' '^php.*' '^php8.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
'^dotnet-.*' '^libmono-.*' '^mono-.*' monodoc-http '^r-.*' '^ruby.*' \
ant ant-optional aria2 azure-cli firefox google-chrome-stable microsoft-edge-stable powershell \
imagemagick '^imagemagick-.*' '^libmagickcore-.*' '^libmagickwand-.*' kubectl mercurial mercurial-common subversion
Expand All @@ -74,44 +74,49 @@ jobs:
df -h
dpkg -l

- name: Build Conan Builder Image
run: |
set -ex
pipenv run aswfdocker \
--verbose \
build \
--ci-image-type IMAGE \
--group baseos-gl-conan \
--version ${{ matrix.common_version_noclang }} \
--push NO

- name: Build Ninja and CMake (Conan)
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group common \
--version ${{ matrix.common_version_noclang }} \
--version ${{ matrix.common_version }} \
--use-conan \
--build-missing \
--target ninja \
--target cmake
--target cmake \
--push NO

- name: Build Clang (Conan)
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group common \
--version ${{ matrix.common_version_noclang }} \
--version ${{ matrix.common_version }} \
--use-conan \
--build-missing \
--target clang
--target clang \
--push NO

- name: Build ci-common Docker Image for downstream images
run: |
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type IMAGE \
Expand All @@ -123,120 +128,110 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base1-wrappers \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base1 level 1 Conan packages
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base1-1 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base1 level 2 Conan packages
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base1-2 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base1 level 3 Conan packages
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base1-3 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base2 system wrapper Conan packages for ci-baseqt image
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base2-wrappers \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base2 system Conan packages for ci-baseqt image
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base2-1
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base2 level 2 Conan packages (Qt) for ci-baseqt image
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base2-2 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base3 Conan packages (PySide) for base image
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
--group base3 \
--version ${{ matrix.version_noclang }} \
--use-conan \
--build-missing
--build-missing \
--push NO

- name: Build base and baseqt images
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type IMAGE \
Expand All @@ -248,8 +243,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -263,8 +256,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -278,8 +269,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -293,8 +282,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -308,8 +295,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -323,8 +308,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -338,8 +321,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -353,8 +334,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type PACKAGE \
Expand All @@ -367,8 +346,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type IMAGE \
Expand All @@ -381,8 +358,6 @@ jobs:
run: |
set -ex
pipenv run aswfdocker \
--repo-uri $GITHUB_REPOSITORY \
--source-branch $GITHUB_REF \
--verbose \
build \
--ci-image-type IMAGE \
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 --conan-login
args: --use-conan
build: ${{ contains(github.ref, '/ci-package') }}
push_description: false

Expand Down
26 changes: 15 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,42 @@

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

# 2025-09-03
# 2025-10-24

2024.4 / 2025.3 / 2026.1 releases to address issues in the previous set of releases encountered by consumer
ASWF projects. This highlights the need for more thorough testing of non-Conan project builds in the
resulting ci-XXXX images.

- All releases
- Update rawtoaces 1.1-rc3 to 1.1.0 (no code changes)
- Re-enable building LLVM's compiler-rt, OSL uses it for address space sanitization for instance
- Force Eigen3 CMake files to be generated and installed to allow rawtoaces to find it
- Re-enable building LLVM's compiler-rt, OSL uses it for address space sanitization for instance ([#295](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/295))
- Force Eigen3 CMake files to be generated and installed to allow rawtoaces to find it ([#273](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/273)) ([#292](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/292))
- Fix libiconv download URLs (ftpmirror.gnu.org is prefered to ftp.gnu.org)
- OCIO Conan package correctly declares its link time dependencies, consumer packages no longer need to know
about its dependencies
- Correctly handle OIIO Conan package name being different than its CMake target name
- Remove LibRaw-devel from base image, it would confuse CMake for some ASWF project versions which would end up mixing up the newer LibRaw in /usr/local and the older system installed one.
- Fix some discrepancies in the Conan 2 environment files (we really need a single
source of truth for all version information).
- Build command line utilities and Ax when building OpenVDB package, and install missing dependencies for these additional components (glfw3). Ax cannot be built with OpenVDB older than 12.1.0 since this is where support for clang/llvm 16 or newer shows up.
- Dockerfile to build ci-baseos-gl-conan image should how pull from Docker Hub instead of always rebuilding locally
- Build command line utilities, tests and Ax when building OpenVDB package, and install missing dependencies for these additional components (glfw3, gtest). Ax cannot be built with OpenVDB older than 12.1.0 since this is where support for clang/llvm 16 or newer shows up ([#293](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/293))
- Dockerfile to build ci-baseos-gl-conan image should how pull from Docker Hub instead of always rebuilding locally ([#257](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/257))
- release.yml GHA workflow should now always rebuild even if an existing binary package exists in the Conan repository
- 2024.4
- revert to MaterialX 1.39.1 which is complatible with USD 24.08
- install MaterialX CMake files in expected location
- Revert to MaterialX 1.39.1 which is compatible with USD 24.08
- Install MaterialX CMake files in expected location
- Fix up OCIO CMake dependencies
- Allow OIIO to find OCIO, libraw and openj2k dependencies
- Backport OSL fix for serialized CUDA build
- 2025.3
- install MaterialX CMake files in expected location
- Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer
- Install MaterialX CMake files in expected location
- Update OpenImageIO from 3.0.9.1 to 3.1.6.2
- Update OpenVDB from 12.0.1 to 12.1.1 to allow Ax to build with llvm 16 or newer ([#285](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/285))
- 2026.1
- Update IMath from 3.2.0 to 3.2.1
- Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer
- Update OpenImageIO from 3.0.9.1 to 3.1.6.2
- Update IMath from 3.2.0 to 3.2.2
- Update OpenEXR from 3.4-alpha to 3.4.2 (VFX Platform 2026 version)
- Update OpenColorIO from 2.4.2 to 2.5.0 (VFX Platform 2026 version)
- Update OpenVDB from 12.0.1 to 12.1.1 to allow Ax to build with llvm 16 or newer (does not yet include OpenVDB 13 for VFX Platform 2026) ([#285]https://github.com/AcademySoftwareFoundation/aswf-docker/issues/285)

# 2025-08-14

Expand Down
Loading
Loading