Skip to content

Commit 39157e3

Browse files
committed
ci: Repair broken CI for things that rusted away in 2.5 land
Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 4fb7d28 commit 39157e3

3 files changed

Lines changed: 20 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -454,54 +454,58 @@ jobs:
454454
runner: ubuntu-22.04
455455
cxx_compiler: clang++
456456
cc_compiler: clang
457-
cxx_std: 20
457+
cxx_std: 17
458458
fmt_ver: 10.1.1
459459
openexr_ver: v3.1.11
460460
pybind11_ver: v2.9.2
461-
python_ver: 3.8
461+
python_ver: "3.10"
462462
simd: avx2,f16c
463463
setenvs: export LLVM_VERSION=14.0.0
464-
OPENCOLORIO_VERSION=v2.1.2
464+
xOPENCOLORIO_VERSION=v2.1.3
465465
USE_OPENVDB=0
466466
QT_VERSION=6
467467
# The installed OpenVDB has a TLS conflict with Python 3.8
468-
- desc: debug gcc7/C++14, sse4.2, exr2.4
469-
nametag: linux-gcc7-cpp14-debug
468+
- desc: debug gcc9/C++14, sse4.2, exr2.4
469+
nametag: linux-gcc9-cpp14-debug
470470
runner: ubuntu-22.04
471471
container:
472472
image: ubuntu-18.04
473-
cxx_compiler: g++-7
473+
cxx_compiler: g++-9
474474
cxx_std: 14
475-
python_ver: 2.7
475+
python_ver: "3.10"
476476
simd: sse4.2
477477
openexr_ver: v2.4.3
478-
pybind11_ver: v2.6.2
478+
pybind11_ver: v2.9.2
479479
setenvs: export CMAKE_BUILD_TYPE=Debug
480480
PUGIXML_VERSION=v1.9
481481
CTEST_TEST_TIMEOUT=1200
482-
483-
- desc: gcc8 C++17 avx exr2.5
482+
USE_OPENVDB=0
483+
- desc: gcc9 C++17 avx exr2.5
484484
nametag: linux-gcc8
485485
runner: ubuntu-22.04
486486
container:
487487
image: ubuntu-18.04
488-
cc_compiler: gcc-8
489-
cxx_compiler: g++-8
488+
cc_compiler: gcc-9
489+
cxx_compiler: g++-9
490490
cxx_std: 17
491491
openexr_ver: v2.5.8
492492
pybind11_ver: v2.5.0
493+
python_ver: "3.10"
493494
simd: avx
494495
setenvs: export EXTRA_DEP_PACKAGES=libjpeg-turbo8-dev
495-
- desc: static libs gcc7 C++14 exr2.4
496+
USE_OPENVDB=0
497+
- desc: static libs gcc9 C++14 exr2.4
496498
nametag: linux-static
497499
runner: ubuntu-22.04
498500
container:
499501
image: ubuntu-18.04
500-
cxx_compiler: g++-7
502+
cxx_compiler: g++-9
501503
cxx_std: 14
502504
openexr_ver: v2.4.3
503505
pybind11_ver: v2.6.2
506+
python_ver: "3.10"
504507
setenvs: export BUILD_SHARED_LIBS=OFF
508+
USE_OPENVDB=0
505509
depcmds: |
506510
sudo rm -rf /usr/local/include/OpenEXR
507511
sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}

src/build-scripts/gh-installdeps.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ else
108108
# Nonstandard python versions
109109
if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
110110
time sudo apt-get -q install -y python3.9-dev python3-numpy
111-
elif [[ "$PYTHON_VERSION" == "2.7" ]] ; then
112-
time sudo apt-get -q install -y python2-dev python2-numpy
111+
# elif [[ "$PYTHON_VERSION" == "2.7" ]] ; then
112+
# time sudo apt-get -q install -y python2-dev python2-numpy
113113
fi
114114
if [[ "${PIP_INSTALLS:=numpy}" != "none" ]] ; then
115115
time pip3 install ${PIP_INSTALLS}
2.46 KB
Binary file not shown.

0 commit comments

Comments
 (0)