CI set touch-ups to latest versions

Proper test against VFX Platform 2022 using the latest ASWF docker container. This includes Python 3.9. Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Aug 29, 2021 · c3d0283 · c3d0283
1 parent 5a38e3f
commit c3d0283
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -121,7 +121,7 @@ jobs:
             build/*/CMake*.{txt,log}
 
   vfxplatform-2021:
-    name: "Linux VFXP-2021 gcc9/C++17 llvm10 py3.7 boost-1.70 exr-2.5 OIIO-2.2 avx2"
+    name: "Linux VFXP-2021 gcc9/C++17 llvm10 py3.7 boost-1.73 exr-2.5 OIIO-2.2 avx2"
     runs-on: ubuntu-latest
     container:
       image: aswf/ci-osl:2021
@@ -168,19 +168,20 @@ jobs:
             build/*/testsuite/*/*.*
             build/*/CMake*.{txt,log}
 
-  vfxplatform-2021-exr3:
-    name: "Linux VFXP-2021 gcc9/C++17 llvm11 py3.7 boost-1.70 exr-3.0 OIIO-2.2 avx2"
+  vfxplatform-2022:
+    name: "Linux VFXP-2022 gcc9/C++17 llvm11 py3.9 boost-1.75 exr-3.1 OIIO-2.3 avx2"
     runs-on: ubuntu-latest
     container:
-      image: aswf/ci-osl:2021-clang11
+      image: aswf/ci-osl:2022-clang11
     env:
       CXX: g++
       CC: gcc
       CMAKE_CXX_STANDARD: 17
-      PYTHON_VERSION: 3.7
+      PYTHON_VERSION: 3.9
       USE_SIMD: avx2,f16c
-      OPENEXR_VERSION: v3.0.4
-      OPENIMAGEIO_VERSION: RB-2.2
+      OPENEXR_VERSION: v3.1.1
+      OPENIMAGEIO_VERSION: dev-2.3
+      PYBIND11_VERSION: v2.7.1
     steps:
       - uses: actions/checkout@v2
       - name: Prepare ccache timestamp
@@ -201,8 +202,8 @@ jobs:
             src/build-scripts/ci-startup.bash
       - name: Dependencies
         run: |
-            sudo rm -rf /usr/local/include/OpenEXR
-            sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
+            sudo rm -rf /usr/local/include/{Imath,OpenEXR}
+            sudo rm -rf /usr/local/lib64/cmake/{Imath,OpenEXR}
             src/build-scripts/gh-installdeps.bash
       - name: Build
         run: |
@@ -272,7 +273,7 @@ jobs:
             optix.h
 
   linux-debug-gcc7-llvm8:
-    name: "Linux Debug gcc7, C++14, llvm8, OIIO release, sse4, exr2.4"
+    name: "Linux Debug gcc7, C++14, llvm8, OIIO release, py2.7, boost1.65, sse4, exr2.4"
     runs-on: ubuntu-18.04
     env:
       CXX: g++-7
@@ -321,7 +322,7 @@ jobs:
             build/*/CMake*.{txt,log}
 
   linux-clang9-llvm9:
-    name: "Linux clang9, C++14, llvm9, oiio release, avx2, exr2.4"
+    name: "Linux clang9, C++14, llvm9, oiio release, boost1.66, avx2, exr2.3, py2.7"
     runs-on: ubuntu-18.04
     container:
       image: aswf/ci-osl:2019-clang9
@@ -369,7 +370,7 @@ jobs:
             build/*/CMake*.{txt,log}
 
   linux-clang11-llvm11:
-    name: "Linux clang11/C++17 llvm-11 oiio-master avx2 exr3.0"
+    name: "Linux clang11/C++17 llvm-11 oiio-master avx2 exr3.0 py3.7 boost1.73"
     runs-on: ubuntu-latest
     container:
       image: aswf/ci-osl:2021-clang11
@@ -420,7 +421,7 @@ jobs:
             build/*/CMake*.{txt,log}
 
   linux-2021ish-gcc8-llvm10:
-    name: "Linux gcc8, C++17, llvm10, oiio master, avx2, exr2.5, avx2"
+    name: "Linux gcc8, C++17, llvm10, oiio master, avx2, exr2.5, boost1.65, avx2"
     runs-on: ubuntu-18.04
     env:
       CXX: g++-8
@@ -470,21 +471,21 @@ jobs:
   linux-latest-release:
     # Test against development master for relevant dependencies, latest
     # supported releases of everything else.
-    name: "Linux latest releases: gcc10, C++17, llvm11, avx2"
+    name: "Linux latest releases: gcc10/C++17, llvm12, oiio-master, py3.8, boost1.71, exr3.1, ocio2.0, avx2"
     runs-on: ubuntu-20.04
     env:
       CXX: g++-10
       USE_CPP: 17
       CMAKE_CXX_STANDARD: 17
-      LLVM_VERSION: 11.0.0
+      LLVM_VERSION: 12.0.0
       LLVM_DISTRO_NAME: ubuntu-20.04
       USE_SIMD: avx2,f16c
       OPENEXR_VERSION: v3.1.0
       OPENIMAGEIO_VERSION: master
       OPENIMAGEIO_CMAKE_FLAGS: -DBUILD_FMT_VERSION=8.0.0
       OPENCOLORIO_VERSION: v2.0.1
-      PYBIND11_VERSION: v2.7.0
       PUGIXML_VERSION: v1.11.4
+      PYBIND11_VERSION: v2.7.1
       PYTHON_VERSION: 3.8
     steps:
       - uses: actions/checkout@v2
@@ -524,7 +525,7 @@ jobs:
   linux-bleeding-edge:
     # Test against development master for relevant dependencies, latest
     # supported releases of everything else.
-    name: "Linux bleeding edge: gcc11, C++17, llvm12, oiio/ocio/exr/pybind-master, avx2"
+    name: "Linux bleeding edge: gcc11, C++17, llvm12, oiio/ocio/exr/pybind-master, py3.8, avx2"
     runs-on: ubuntu-20.04
     env:
       CXX: g++-11
@@ -537,8 +538,9 @@ jobs:
       OPENIMAGEIO_VERSION: master
       OPENIMAGEIO_CMAKE_FLAGS: -DBUILD_FMT_VERSION=master
       OPENCOLORIO_VERSION: master
-      PYBIND11_VERSION: master
       PUGIXML_VERSION: master
+      PYBIND11_VERSION: master
+      PYTHON_VERSION: 3.8
       OSL_BUILD_MATERIALX: 1
     steps:
       - uses: actions/checkout@v2
@@ -578,7 +580,7 @@ jobs:
   linux-oldest:
     # Oldest versions of the dependencies that we can muster, and various
     # things disabled.
-    name: "Linux oldest everything: gcc6 C++11 llvm7 py2.7 boost-1.66 oiio-2.0 no-simd exr2.3"
+    name: "Linux oldest everything: gcc6/C++11 llvm7 py-no boost-1.66 oiio-2.0 no-simd exr2.3"
     runs-on: ubuntu-latest
     container:
       image: aswf/ci-osl:2019-clang7

diff --git a/INSTALL.md b/INSTALL.md
@@ -12,7 +12,7 @@ Dependencies
 OSL requires the following dependencies or tools.
 NEW or CHANGED dependencies since the last major release are **bold**.
 
-* Build system: [CMake](https://cmake.org/) 3.12 or newer (tested through 3.20)
+* Build system: [CMake](https://cmake.org/) 3.12 or newer (tested through 3.21)
 
 * A suitable C++11 compiler to build OSL itself, which may be any of:
    - GCC 4.8.5 or newer (tested through gcc 11)
@@ -24,7 +24,7 @@ NEW or CHANGED dependencies since the last major release are **bold**.
   required (unless you are using LLVM >= 10, in which case at least C++14
   is needed).
 
-* **[OpenImageIO](http://openimageio.org) 2.0 or newer** (tested through 2.2)
+* **[OpenImageIO](http://openimageio.org) 2.0 or newer** (tested through 2.3)
 
     OSL uses OIIO both for its texture mapping functionality as well as
     numerous utility classes.  If you are integrating OSL into an existing
@@ -50,8 +50,8 @@ NEW or CHANGED dependencies since the last major release are **bold**.
   later. If you *must* build OSL with C++11, you need to use an LLVM that
   is LLVM 9 or earlier.
 
-* [Boost](https://www.boost.org) 1.55 or newer (tested through boost 1.75)
-* [Ilmbase or Imath](http://openexr.com/downloads.html) 2.0 or newer (tested through 3.0)
+* [Boost](https://www.boost.org) 1.55 or newer (tested through boost 1.76)
+* [Ilmbase or Imath](http://openexr.com/downloads.html) 2.0 or newer (tested through 3.1)
 * [Flex](https://github.com/westes/flex) and
   [GNU Bison](https://www.gnu.org/software/bison/)
 * [PugiXML](http://pugixml.org/)
@@ -61,7 +61,7 @@ NEW or CHANGED dependencies since the last major release are **bold**.
 * (optional) Python: If you are building the Python bindings or running the
    testsuite:
      * Python >= 2.7 (tested against 2.7, 3.6, 3.7, 3.8, 3.9)
-     * pybind11 >= 2.4.2 (Tested through 2.7)
+     * pybind11 >= 2.4.2 (Tested through 2.7).
      * NumPy
 * (optional) Qt >= 5.6 (tested through 5.15).  If not found at build time,
   the `osltoy` application will be disabled.