diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 595dbb0f..cb64ae20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,22 +20,26 @@ jobs: fail-fast: false matrix: + c_compiler: [gcc, clang] writer: [ON, OFF] include: - - desc: gcc11 # /C++17 boost1.8 exr3.1 + - c_compiler: gcc + desc: gcc11 # /C++17 boost1.8 exr3.1 nametag: linux-vfx2023 os: ubuntu-latest container: aswf/ci-osl:2023-clang15 vfxyear: 2023 + cxx_compiler: g++ cxx_std: 17 - - desc: clang15 # /C++17 boost1.8 exr3.1 + - c_compiler: clang + desc: clang15 # /C++17 boost1.8 exr3.1 nametag: linux-vfx2022-clang13 os: ubuntu-latest container: aswf/ci-osl:2023-clang15 vfxyear: 2023 - cc_compiler: clang cxx_compiler: clang++ cxx_std: 17 + env: CXX: ${{matrix.cxx_compiler}} CC: ${{matrix.cc_compiler}} diff --git a/build_scripts/install_deps_linux.bash b/build_scripts/install_deps_linux.bash index adaae04b..642e0569 100755 --- a/build_scripts/install_deps_linux.bash +++ b/build_scripts/install_deps_linux.bash @@ -5,7 +5,7 @@ set -ex time sudo apt-get update time sudo apt-get -q -f install -y \ - libunwind-dev \ + libunwind-dev libopenexr-dev \ libboost-dev libboost-filesystem-dev \ libboost-test-dev \ libraw-dev libceres-dev