Skip to content

Commit 652f6d3

Browse files
committed
ci: Add a VFX Platform 2026 CI job (AcademySoftwareFoundation#4856)
And a bunch of other minor updates: * Change from 'testing' to regular containers * Add forgotten 'export' * Update default self-build pybind11 to 3.0.0 --------- Signed-off-by: Larry Gritz <[email protected]>
1 parent 24e8e26 commit 652f6d3

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,12 @@ jobs:
283283
- desc: VFX2023 gcc11/C++17 py3.10 exr3.1 ocio2.2
284284
nametag: linux-vfx2023
285285
runner: ubuntu-latest
286-
container: aswftesting/ci-osl:2023-clang15
286+
container: aswf/ci-osl:2023-clang15
287287
python_ver: "3.10"
288288
simd: "avx2,f16c"
289289
fmt_ver: 10.1.1
290290
pybind11_ver: v2.10.0
291-
setenvs: PUGIXML_VERSION=v1.13
291+
setenvs: export PUGIXML_VERSION=v1.13
292292
- desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15
293293
nametag: linux-vfx2023.icc
294294
runner: ubuntu-latest
@@ -324,39 +324,50 @@ jobs:
324324
- desc: VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
325325
nametag: linux-vfx2024
326326
runner: ubuntu-latest
327-
container: aswftesting/ci-osl:2024-clang17
327+
container: aswf/ci-oiio:2024
328328
python_ver: "3.11"
329329
simd: "avx2,f16c"
330330
fmt_ver: 10.1.1
331331
pybind11_ver: v2.12.0
332332
benchmark: 1
333-
setenvs: PUGIXML_VERSION=v1.14
333+
setenvs: export PUGIXML_VERSION=v1.14
334334
- desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
335335
nametag: linux-vfx2024.clang
336336
runner: ubuntu-latest
337-
container: aswftesting/ci-osl:2024-clang17
337+
container: aswf/ci-oiio:2024
338338
cc_compiler: clang
339339
cxx_compiler: clang++
340340
python_ver: "3.11"
341341
simd: "avx2,f16c"
342342
fmt_ver: 10.1.1
343343
pybind11_ver: v2.12.0
344344
benchmark: 1
345-
setenvs: PUGIXML_VERSION=v1.14
345+
setenvs: export PUGIXML_VERSION=v1.14
346346
- desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
347347
nametag: linux-vfx2025
348348
runner: ubuntu-latest
349-
container: aswftesting/ci-oiio:2025
349+
container: aswf/ci-oiio:2025
350+
cxx_std: 17
350351
python_ver: "3.11"
351352
simd: "avx2,f16c"
352353
fmt_ver: 11.1.4
353354
pybind11_ver: v2.13.6
354355
benchmark: 1
355-
setenvs: PUGIXML_VERSION=v1.15
356+
setenvs: export PUGIXML_VERSION=v1.15
357+
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
358+
nametag: linux-vfx2026
359+
runner: ubuntu-latest
360+
container: aswf/ci-oiio:2026
361+
cxx_std: 20
362+
python_ver: "3.13"
363+
simd: "avx2,f16c"
364+
pybind11_ver: v3.0.0
365+
benchmark: 1
366+
# setenvs: export
356367
- desc: Sanitizers
357368
nametag: sanitizer
358369
runner: ubuntu-latest
359-
container: aswf/ci-osl:2024-clang17
370+
container: aswf/ci-oiio:2024
360371
cc_compiler: clang
361372
cxx_compiler: clang++
362373
build_type: Debug

src/build-scripts/build_pybind11.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -ex
1111

1212
# Repo and branch/tag/commit of pybind11 to download if we don't have it yet
1313
PYBIND11_REPO=${PYBIND11_REPO:=https://github.com/pybind/pybind11.git}
14-
PYBIND11_VERSION=${PYBIND11_VERSION:=v2.12.0}
14+
PYBIND11_VERSION=${PYBIND11_VERSION:=v3.0.0}
1515

1616
# Where to put pybind11 repo source (default to the ext area)
1717
PYBIND11_SRC_DIR=${PYBIND11_SRC_DIR:=${PWD}/ext/pybind11}

src/cmake/build_pybind11.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# pybind11 by hand!
77
######################################################################
88

9-
set_cache (pybind11_BUILD_VERSION 2.12.0 "pybind11 version for local builds")
9+
set_cache (pybind11_BUILD_VERSION 3.0.0 "pybind11 version for local builds")
1010
set (pybind11_GIT_REPOSITORY "https://github.com/pybind/pybind11")
1111
set (pybind11_GIT_TAG "v${pybind11_BUILD_VERSION}")
1212
set_cache (pybind11_BUILD_SHARED_LIBS ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}

0 commit comments

Comments
 (0)