ci: Bump the dependency versions for the 'latest' test to the actual …

…latest Raise latest test to ubuntu 24.04, gcc to 13 Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Sep 8, 2024 · 962b7e2 · 962b7e2
1 parent f751f21
commit 962b7e2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -308,27 +308,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - desc: latest releases gcc12 C++17 avx2 exr3.2 ocio2.3
+          - desc: latest releases gcc13 C++20 py3.12 avx2 exr3.2 ocio2.3
             nametag: linux-latest-releases
-            runner: ubuntu-22.04
-            cc_compiler: gcc-12
-            cxx_compiler: g++-12
-            cxx_std: 17
-            fmt_ver: 10.1.1
+            runner: ubuntu-24.04
+            cc_compiler: gcc-13
+            cxx_compiler: g++-13
+            cxx_std: 20
+            fmt_ver: 11.0.2
             opencolorio_ver: v2.3.2
             openexr_ver: v3.2.4
-            pybind11_ver: v2.12.0
-            python_ver: "3.10"
+            pybind11_ver: v2.13.5
+            python_ver: "3.12"
             simd: avx2,f16c
-            setenvs: export LIBJPEGTURBO_VERSION=3.0.1
+            setenvs: export LIBJPEGTURBO_VERSION=3.0.3
                             LIBRAW_VERSION=0.21.2
                             LIBTIFF_VERSION=v4.6.0
-                            OPENJPEG_VERSION=v2.4.0
-                            PTEX_VERSION=v2.4.2
+                            OPENJPEG_VERSION=v2.5.2
+                            PTEX_VERSION=v2.4.3
                             PUGIXML_VERSION=v1.14
                             WEBP_VERSION=v1.4.0
-                            FREETYPE_VERSION=VER-2-13-2
-                            EXTRA_DEP_PACKAGES="libboost-dev"
+                            FREETYPE_VERSION=VER-2-13-3
+                            USE_OPENVDB=0
           - desc: bleeding edge gcc14 C++20 py3.12 OCIO/libtiff/exr-master avx2
             nametag: linux-bleeding-edge
             runner: ubuntu-24.04
@@ -351,7 +351,6 @@ jobs:
                             OIIO_CMAKE_FLAGS="-DFORTIFY_SOURCE=2"
                             QT_VERSION=6
                             EXTRA_DEP_PACKAGES="python3.12-dev python3-numpy"
-                            PIP_INSTALLS="none"
                             USE_OPENVDB=0
                             SKIP_APT_GET_UPDATE=1
                             FREETYPE_VERSION=master
@@ -375,7 +374,6 @@ jobs:
                             PTEX_VERSION=v2.4.2
                             PUGIXML_VERSION=v1.14
                             WEBP_VERSION=v1.4.0
-                            EXTRA_DEP_PACKAGES="libboost-dev"
           - desc: clang14 C++20 avx2 exr3.1 ocio2.1
             nametag: linux-clang14
             runner: ubuntu-20.04

diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
@@ -108,11 +108,12 @@ else
     fi
 
     # Nonstandard python versions
-    if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
-        time sudo apt-get -q install -y python3.9-dev python3-numpy
-        pip3 --version
-    fi
-    if [[ "${PIP_INSTALLS:=numpy}" != "none" ]] ; then
+    # if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
+    #     time sudo apt-get -q install -y python3.9-dev python3-numpy
+    #     pip3 --version
+    # fi
+    time sudo apt-get -q install -y python3-numpy
+    if [[ "${PIP_INSTALLS}" != "" ]] ; then
         time pip3 install ${PIP_INSTALLS}
     fi
 
@@ -126,20 +127,6 @@ else
 
     export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH
 
-    if [[ "$CXX" == "g++-9" ]] ; then
-        time sudo apt-get install -y g++-9
-    elif [[ "$CXX" == "g++-10" ]] ; then
-        time sudo apt-get install -y g++-10
-    elif [[ "$CXX" == "g++-11" ]] ; then
-        time sudo apt-get install -y g++-11
-    elif [[ "$CXX" == "g++-12" ]] ; then
-        time sudo apt-get install -y g++-12
-    elif [[ "$CXX" == "g++-13" ]] ; then
-        time sudo apt-get install -y g++-13
-    elif [[ "$CXX" == "g++-14" ]] ; then
-        time sudo apt-get install -y g++-14
-    fi
-
     if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" || "$USE_ICX" != "" ]] ; then
         time sudo apt-get -q install -y wget
         wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB