Skip to content

Commit 9e7d50b

Browse files
committed
fixes
Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 35f0897 commit 9e7d50b

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,8 @@ jobs:
409409
- desc: bleeding edge gcc15 C++23 py3.12 OCIO/libtiff/exr-main avx2
410410
nametag: linux-bleeding-edge
411411
runner: ubuntu-24.04
412-
cc_compiler: gcc-15
413-
cxx_compiler: g++-15
412+
# cc_compiler: gcc-15
413+
# cxx_compiler: g++-15
414414
cxx_std: 23
415415
fmt_ver: master
416416
opencolorio_ver: main
@@ -420,7 +420,8 @@ jobs:
420420
simd: avx2,f16c
421421
benchmark: 1
422422
gcc_action_ver: 15
423-
setenvs: export LIBJPEGTURBO_VERSION=main
423+
setenvs: export OIIO_CC=gcc-15 OIIO_CXX=g++-15
424+
LIBJPEGTURBO_VERSION=main
424425
LIBPNG_VERSION=master
425426
LIBRAW_VERSION=master
426427
LIBTIFF_VERSION=master
@@ -435,6 +436,7 @@ jobs:
435436
QT_VERSION=0 INSTALL_OPENCV=0 USE_OPENVDB=0
436437
UHDR_CMAKE_C_COMPILER=gcc
437438
UHDR_CMAKE_CXX_COMPILER=g++
439+
OPENCOLORIO_CXX=c++
438440
# The installed OpenVDB has a TLS conflict with Python 3.8
439441
# Ensure we are testing all the deps we think we are. We would
440442
# like this test to have minimal missing dependencies.

0 commit comments

Comments
 (0)