Skip to content

Commit 55e6e97

Browse files
jfpanissetjfpanisset
committed
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 ([#295](#295)) - Force Eigen3 CMake files to be generated and installed to allow rawtoaces to find it ([#273](#273)) ([#292](#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 their 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, 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](#293)) - Dockerfile to build ci-baseos-gl-conan image should how pull from Docker Hub instead of always rebuilding locally ([#257](#257)) - release.yml GHA workflow should now always rebuild even if an existing binary package exists in the Conan repositoriy - 2024,4 - 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 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](#285)) - 2026.1 - 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]#285) Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent d9431fc commit 55e6e97

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+744
-346
lines changed

‎.github/workflows/docker-builds.yml‎

Lines changed: 38 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
include:
27-
- group: vfx-2025
28-
name: vfx-2025
29-
common_version: 5-clang18
30-
common_version_noclang: 5
31-
version: 2025-clang18
32-
version_noclang: 2025
27+
- group: vfx-2026
28+
name: vfx-2026
29+
common_version: 6-clang20
30+
common_version_noclang: 6
31+
version: 2026-clang20
32+
version_noclang: 2026
3333
test: ""
3434

3535
steps:
@@ -53,7 +53,7 @@ jobs:
5353
- name: Free up disk space
5454
run: |
5555
df -h
56-
sudo apt-get remove -y '^llvm-.*' 'php.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
56+
sudo apt-get remove -y '^llvm-.*' '^php.*' '^php8.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
5757
'^dotnet-.*' '^libmono-.*' '^mono-.*' monodoc-http '^r-.*' '^ruby.*' \
5858
ant ant-optional aria2 azure-cli firefox google-chrome-stable microsoft-edge-stable powershell \
5959
imagemagick '^imagemagick-.*' '^libmagickcore-.*' '^libmagickwand-.*' kubectl mercurial mercurial-common subversion
@@ -74,44 +74,49 @@ jobs:
7474
df -h
7575
dpkg -l
7676
77+
- name: Build Conan Builder Image
78+
run: |
79+
set -ex
80+
pipenv run aswfdocker \
81+
--verbose \
82+
build \
83+
--ci-image-type IMAGE \
84+
--group baseos-gl-conan \
85+
--version ${{ matrix.common_version_noclang }} \
86+
--push NO
87+
7788
- name: Build Ninja and CMake (Conan)
7889
run: |
7990
set -ex
8091
pipenv run aswfdocker \
81-
--repo-uri $GITHUB_REPOSITORY \
82-
--source-branch $GITHUB_REF \
8392
--verbose \
8493
build \
8594
--ci-image-type PACKAGE \
8695
--group common \
8796
--version ${{ matrix.common_version_noclang }} \
88-
--version ${{ matrix.common_version }} \
8997
--use-conan \
9098
--build-missing \
9199
--target ninja \
92-
--target cmake
100+
--target cmake \
101+
--push NO
93102
94103
- name: Build Clang (Conan)
95104
run: |
96105
set -ex
97106
pipenv run aswfdocker \
98-
--repo-uri $GITHUB_REPOSITORY \
99-
--source-branch $GITHUB_REF \
100107
--verbose \
101108
build \
102109
--ci-image-type PACKAGE \
103110
--group common \
104-
--version ${{ matrix.common_version_noclang }} \
105111
--version ${{ matrix.common_version }} \
106112
--use-conan \
107113
--build-missing \
108-
--target clang
114+
--target clang \
115+
--push NO
109116
110117
- name: Build ci-common Docker Image for downstream images
111118
run: |
112119
pipenv run aswfdocker \
113-
--repo-uri $GITHUB_REPOSITORY \
114-
--source-branch $GITHUB_REF \
115120
--verbose \
116121
build \
117122
--ci-image-type IMAGE \
@@ -123,120 +128,110 @@ jobs:
123128
run: |
124129
set -ex
125130
pipenv run aswfdocker \
126-
--repo-uri $GITHUB_REPOSITORY \
127-
--source-branch $GITHUB_REF \
128131
--verbose \
129132
build \
130133
--ci-image-type PACKAGE \
131134
--group base1-wrappers \
132135
--version ${{ matrix.version_noclang }} \
133136
--use-conan \
134-
--build-missing
137+
--build-missing \
138+
--push NO
135139
136140
- name: Build base1 level 1 Conan packages
137141
run: |
138142
set -ex
139143
pipenv run aswfdocker \
140-
--repo-uri $GITHUB_REPOSITORY \
141-
--source-branch $GITHUB_REF \
142144
--verbose \
143145
build \
144146
--ci-image-type PACKAGE \
145147
--group base1-1 \
146148
--version ${{ matrix.version_noclang }} \
147149
--use-conan \
148-
--build-missing
150+
--build-missing \
151+
--push NO
149152
150153
- name: Build base1 level 2 Conan packages
151154
run: |
152155
set -ex
153156
pipenv run aswfdocker \
154-
--repo-uri $GITHUB_REPOSITORY \
155-
--source-branch $GITHUB_REF \
156157
--verbose \
157158
build \
158159
--ci-image-type PACKAGE \
159160
--group base1-2 \
160161
--version ${{ matrix.version_noclang }} \
161162
--use-conan \
162-
--build-missing
163+
--build-missing \
164+
--push NO
163165
164166
- name: Build base1 level 3 Conan packages
165167
run: |
166168
set -ex
167169
pipenv run aswfdocker \
168-
--repo-uri $GITHUB_REPOSITORY \
169-
--source-branch $GITHUB_REF \
170170
--verbose \
171171
build \
172172
--ci-image-type PACKAGE \
173173
--group base1-3 \
174174
--version ${{ matrix.version_noclang }} \
175175
--use-conan \
176-
--build-missing
176+
--build-missing \
177+
--push NO
177178
178179
- name: Build base2 system wrapper Conan packages for ci-baseqt image
179180
run: |
180181
set -ex
181182
pipenv run aswfdocker \
182-
--repo-uri $GITHUB_REPOSITORY \
183-
--source-branch $GITHUB_REF \
184183
--verbose \
185184
build \
186185
--ci-image-type PACKAGE \
187186
--group base2-wrappers \
188187
--version ${{ matrix.version_noclang }} \
189188
--use-conan \
190-
--build-missing
189+
--build-missing \
190+
--push NO
191191
192192
- name: Build base2 system Conan packages for ci-baseqt image
193193
run: |
194194
set -ex
195195
pipenv run aswfdocker \
196-
--repo-uri $GITHUB_REPOSITORY \
197-
--source-branch $GITHUB_REF \
198196
--verbose \
199197
build \
200198
--ci-image-type PACKAGE \
201199
--group base2-1
202200
--version ${{ matrix.version_noclang }} \
203201
--use-conan \
204-
--build-missing
202+
--build-missing \
203+
--push NO
205204
206205
- name: Build base2 level 2 Conan packages (Qt) for ci-baseqt image
207206
run: |
208207
set -ex
209208
pipenv run aswfdocker \
210-
--repo-uri $GITHUB_REPOSITORY \
211-
--source-branch $GITHUB_REF \
212209
--verbose \
213210
build \
214211
--ci-image-type PACKAGE \
215212
--group base2-2 \
216213
--version ${{ matrix.version_noclang }} \
217214
--use-conan \
218-
--build-missing
215+
--build-missing \
216+
--push NO
219217
220218
- name: Build base3 Conan packages (PySide) for base image
221219
run: |
222220
set -ex
223221
pipenv run aswfdocker \
224-
--repo-uri $GITHUB_REPOSITORY \
225-
--source-branch $GITHUB_REF \
226222
--verbose \
227223
build \
228224
--ci-image-type PACKAGE \
229225
--group base3 \
230226
--version ${{ matrix.version_noclang }} \
231227
--use-conan \
232-
--build-missing
228+
--build-missing \
229+
--push NO
233230
234231
- name: Build base and baseqt images
235232
run: |
236233
set -ex
237234
pipenv run aswfdocker \
238-
--repo-uri $GITHUB_REPOSITORY \
239-
--source-branch $GITHUB_REF \
240235
--verbose \
241236
build \
242237
--ci-image-type IMAGE \
@@ -248,8 +243,6 @@ jobs:
248243
run: |
249244
set -ex
250245
pipenv run aswfdocker \
251-
--repo-uri $GITHUB_REPOSITORY \
252-
--source-branch $GITHUB_REF \
253246
--verbose \
254247
build \
255248
--ci-image-type PACKAGE \
@@ -263,8 +256,6 @@ jobs:
263256
run: |
264257
set -ex
265258
pipenv run aswfdocker \
266-
--repo-uri $GITHUB_REPOSITORY \
267-
--source-branch $GITHUB_REF \
268259
--verbose \
269260
build \
270261
--ci-image-type PACKAGE \
@@ -278,8 +269,6 @@ jobs:
278269
run: |
279270
set -ex
280271
pipenv run aswfdocker \
281-
--repo-uri $GITHUB_REPOSITORY \
282-
--source-branch $GITHUB_REF \
283272
--verbose \
284273
build \
285274
--ci-image-type PACKAGE \
@@ -293,8 +282,6 @@ jobs:
293282
run: |
294283
set -ex
295284
pipenv run aswfdocker \
296-
--repo-uri $GITHUB_REPOSITORY \
297-
--source-branch $GITHUB_REF \
298285
--verbose \
299286
build \
300287
--ci-image-type PACKAGE \
@@ -308,8 +295,6 @@ jobs:
308295
run: |
309296
set -ex
310297
pipenv run aswfdocker \
311-
--repo-uri $GITHUB_REPOSITORY \
312-
--source-branch $GITHUB_REF \
313298
--verbose \
314299
build \
315300
--ci-image-type PACKAGE \
@@ -323,8 +308,6 @@ jobs:
323308
run: |
324309
set -ex
325310
pipenv run aswfdocker \
326-
--repo-uri $GITHUB_REPOSITORY \
327-
--source-branch $GITHUB_REF \
328311
--verbose \
329312
build \
330313
--ci-image-type PACKAGE \
@@ -338,8 +321,6 @@ jobs:
338321
run: |
339322
set -ex
340323
pipenv run aswfdocker \
341-
--repo-uri $GITHUB_REPOSITORY \
342-
--source-branch $GITHUB_REF \
343324
--verbose \
344325
build \
345326
--ci-image-type PACKAGE \
@@ -353,8 +334,6 @@ jobs:
353334
run: |
354335
set -ex
355336
pipenv run aswfdocker \
356-
--repo-uri $GITHUB_REPOSITORY \
357-
--source-branch $GITHUB_REF \
358337
--verbose \
359338
build \
360339
--ci-image-type PACKAGE \
@@ -367,8 +346,6 @@ jobs:
367346
run: |
368347
set -ex
369348
pipenv run aswfdocker \
370-
--repo-uri $GITHUB_REPOSITORY \
371-
--source-branch $GITHUB_REF \
372349
--verbose \
373350
build \
374351
--ci-image-type IMAGE \
@@ -381,8 +358,6 @@ jobs:
381358
run: |
382359
set -ex
383360
pipenv run aswfdocker \
384-
--repo-uri $GITHUB_REPOSITORY \
385-
--source-branch $GITHUB_REF \
386361
--verbose \
387362
build \
388363
--ci-image-type IMAGE \

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build: true
2424
push_description: true
2525
- group: conan
26-
args: --use-conan --conan-login
26+
args: --use-conan
2727
build: ${{ contains(github.ref, '/ci-package') }}
2828
push_description: false
2929

‎CHANGELOG.md‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,42 @@
22

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

5-
# 2025-09-03
5+
# 2025-10-24
66

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

1111
- All releases
1212
- Update rawtoaces 1.1-rc3 to 1.1.0 (no code changes)
13-
- Re-enable building LLVM's compiler-rt, OSL uses it for address space sanitization for instance
14-
- Force Eigen3 CMake files to be generated and installed to allow rawtoaces to find it
13+
- 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))
14+
- 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))
1515
- Fix libiconv download URLs (ftpmirror.gnu.org is prefered to ftp.gnu.org)
1616
- OCIO Conan package correctly declares its link time dependencies, consumer packages no longer need to know
1717
about its dependencies
1818
- Correctly handle OIIO Conan package name being different than its CMake target name
1919
- 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.
2020
- Fix some discrepancies in the Conan 2 environment files (we really need a single
2121
source of truth for all version information).
22-
- 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.
23-
- Dockerfile to build ci-baseos-gl-conan image should how pull from Docker Hub instead of always rebuilding locally
22+
- 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))
23+
- 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))
2424
- release.yml GHA workflow should now always rebuild even if an existing binary package exists in the Conan repository
2525
- 2024.4
26-
- revert to MaterialX 1.39.1 which is complatible with USD 24.08
27-
- install MaterialX CMake files in expected location
26+
- Revert to MaterialX 1.39.1 which is compatible with USD 24.08
27+
- Install MaterialX CMake files in expected location
2828
- Fix up OCIO CMake dependencies
2929
- Allow OIIO to find OCIO, libraw and openj2k dependencies
3030
- Backport OSL fix for serialized CUDA build
3131
- 2025.3
32-
- install MaterialX CMake files in expected location
33-
- Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer
32+
- Install MaterialX CMake files in expected location
33+
- Update OpenImageIO from 3.0.9.1 to 3.1.6.2
34+
- 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))
3435
- 2026.1
35-
- Update IMath from 3.2.0 to 3.2.1
36-
- Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer
36+
- Update OpenImageIO from 3.0.9.1 to 3.1.6.2
37+
- Update IMath from 3.2.0 to 3.2.2
38+
- Update OpenEXR from 3.4-alpha to 3.4.2 (VFX Platform 2026 version)
39+
- Update OpenColorIO from 2.4.2 to 2.5.0 (VFX Platform 2026 version)
40+
- 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)
3741

3842
# 2025-08-14
3943

0 commit comments

Comments
 (0)