Skip to content

Commit 72b23d9

Browse files
lgritzzachlewis
authored andcommitted
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]> Signed-off-by: Zach Lewis <[email protected]>
1 parent b98b88a commit 72b23d9

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
@@ -253,12 +253,12 @@ jobs:
253253
- desc: VFX2023 gcc11/C++17 py3.10 exr3.1 ocio2.2
254254
nametag: linux-vfx2023
255255
runner: ubuntu-latest
256-
container: aswftesting/ci-osl:2023-clang15
256+
container: aswf/ci-osl:2023-clang15
257257
python_ver: "3.10"
258258
simd: "avx2,f16c"
259259
fmt_ver: 10.1.1
260260
pybind11_ver: v2.10.0
261-
setenvs: PUGIXML_VERSION=v1.13
261+
setenvs: export PUGIXML_VERSION=v1.13
262262
- desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15
263263
nametag: linux-vfx2023.icc
264264
runner: ubuntu-latest
@@ -294,39 +294,50 @@ jobs:
294294
- desc: VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
295295
nametag: linux-vfx2024
296296
runner: ubuntu-latest
297-
container: aswftesting/ci-osl:2024-clang17
297+
container: aswf/ci-oiio:2024
298298
python_ver: "3.11"
299299
simd: "avx2,f16c"
300300
fmt_ver: 10.1.1
301301
pybind11_ver: v2.12.0
302302
benchmark: 1
303-
setenvs: PUGIXML_VERSION=v1.14
303+
setenvs: export PUGIXML_VERSION=v1.14
304304
- desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
305305
nametag: linux-vfx2024.clang
306306
runner: ubuntu-latest
307-
container: aswftesting/ci-osl:2024-clang17
307+
container: aswf/ci-oiio:2024
308308
cc_compiler: clang
309309
cxx_compiler: clang++
310310
python_ver: "3.11"
311311
simd: "avx2,f16c"
312312
fmt_ver: 10.1.1
313313
pybind11_ver: v2.12.0
314314
benchmark: 1
315-
setenvs: PUGIXML_VERSION=v1.14
315+
setenvs: export PUGIXML_VERSION=v1.14
316316
- desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
317317
nametag: linux-vfx2025
318318
runner: ubuntu-latest
319-
container: aswftesting/ci-oiio:2025
319+
container: aswf/ci-oiio:2025
320+
cxx_std: 17
320321
python_ver: "3.11"
321322
simd: "avx2,f16c"
322323
fmt_ver: 11.1.4
323324
pybind11_ver: v2.13.6
324325
benchmark: 1
325-
setenvs: PUGIXML_VERSION=v1.15
326+
setenvs: export PUGIXML_VERSION=v1.15
327+
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
328+
nametag: linux-vfx2026
329+
runner: ubuntu-latest
330+
container: aswf/ci-oiio:2026
331+
cxx_std: 20
332+
python_ver: "3.13"
333+
simd: "avx2,f16c"
334+
pybind11_ver: v3.0.0
335+
benchmark: 1
336+
# setenvs: export
326337
- desc: Sanitizers
327338
nametag: sanitizer
328339
runner: ubuntu-latest
329-
container: aswf/ci-osl:2024-clang17
340+
container: aswf/ci-oiio:2024
330341
cc_compiler: clang
331342
cxx_compiler: clang++
332343
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)