Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Try newest ubuntu 22.04 and MacOS 12 images, test gcc12 #3480

Merged
merged 1 commit into from
Jul 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,11 @@ jobs:
fail-fast: false
matrix:
include:
- desc: latest releases gcc10 C++17 avx2 exr3.1 ocio2.1
- desc: latest releases gcc11 C++17 avx2 exr3.1 ocio2.1
nametag: linux-latest-releases
os: ubuntu-20.04
cxx_compiler: g++-10
cc_compiler: gcc-11
cxx_compiler: g++-11
cxx_std: 17
fmt_ver: 9.0.0
openexr_ver: v3.1.5
Expand All @@ -226,15 +227,16 @@ jobs:
USE_OPENVDB=0
WEBP_VERSION=v1.2.1
# The installed OpenVDB has a TLS conflict with Python 3.8
- desc: bleeding edge gcc11 C++20 py38 OCIO/libtiff/exr-master boost1.71 avx2
- desc: bleeding edge gcc12 C++20 py3.10 OCIO/libtiff/exr-master boost1.74 avx2
nametag: linux-bleeding-edge
os: ubuntu-20.04
cxx_compiler: g++-11
os: ubuntu-22.04
cc_compiler: gcc-12
cxx_compiler: g++-12
cxx_std: 20
fmt_ver: master
openexr_ver: main
pybind11_ver: master
python_ver: 3.8
python_ver: "3.10"
simd: avx2,f16c
setenvs: export LIBRAW_VERSION=master
LIBTIFF_VERSION=master
Expand Down Expand Up @@ -364,6 +366,12 @@ jobs:
cxx_std: 17
python_ver: 3.9
aclang: 13
- desc: MacOS-12
os: macos-12
cxx_std: 20
python_ver: 3.9
aclang: 13
setenvs: export CTEST_TEST_TIMEOUT=300
runs-on: ${{ matrix.os }}
env:
CC: clang
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
* **C++14** (also builds with C++17, and C++20)
* The default build mode is C++14. This can be controlled by via the
CMake configuration flag: `-DCMAKE_CXX_STANDARD=17`, etc.
* Compilers: **gcc 6.1 - 11.2**, **clang 3.4 - 14**, **MSVS 2017 - 2019**,
* Compilers: **gcc 6.1 - 12.1**, **clang 3.4 - 14**, **MSVS 2017 - 2019**,
**Intel icc 17+**, **Intel OneAPI C++ compiler 2022+**.
* CMake >= 3.12 (tested through 3.23)
* OpenEXR/Imath >= 2.3 (recommended: 2.4 or higher; tested through 3.1)
* libTIFF >= 3.9 (recommended: 4.0+; tested through 4.4)
* libjpeg >= 8, or libjpeg-turbo >= 1.1 (tested through jpeg9d and jpeg-turbo
2.1)
* Boost >= 1.53 (recommended: at least 1.66; tested through 1.78)
* Boost >= 1.53 (recommended: at least 1.66; tested through 1.79)
* [fmtlib](https://github.com/fmtlib/fmt) >= 6.1.2 (tested through 9.0). If
not found at build time, this will be automatically downloaded unless the
build sets `-DBUILD_MISSING_FMT=OFF`.
Expand All @@ -35,7 +35,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
* Qt >= 5.6 (tested through 5.15)
* OpenGL
* If you are building the Python bindings or running the testsuite:
* Python >= 2.7 (tested against 2.7, 3.7, 3.8, 3.9)
* Python >= 2.7 (tested against 2.7, 3.7, 3.8, 3.9, 3.10)
* pybind11 >= 2.4.2 (Tested through 2.10. Note that pybind11 v2.10+ does
not support Python < 3.6.)
* NumPy
Expand Down
5 changes: 4 additions & 1 deletion src/build-scripts/gh-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ else
locales wget \
libopencolorio-dev \
libopencv-dev \
qt5-default \
libhdf5-dev
time sudo apt-get -q install -y \
qt5-default || /bin/true
if [[ "${EXTRA_DEP_PACKAGES}" != "" ]] ; then
time sudo apt-get -q install -y ${EXTRA_DEP_PACKAGES}
fi
Expand Down Expand Up @@ -99,6 +100,8 @@ else
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
fi

if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" || "$USE_ICX" != "" ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion src/libutil/strutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ Strutil::escape_chars(string_view unescaped)
case '\f': c = 'f'; break;
case '\a': c = 'a'; break;
}
s.insert(i, &c, 1);
s.insert(i, 1, c);
}
}
return s;
Expand Down
7 changes: 5 additions & 2 deletions src/oiiotool/oiiotool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5677,12 +5677,15 @@ action_printinfo(cspan<const char*> argv)
}


namespace pvtcrash {
size_t crasher = 37;
}


static void
crash_me()
{
size_t a = 37;
char* addr = (char*)a;
char* addr = (char*)pvtcrash::crasher;
OIIO_PRAGMA_WARNING_PUSH
#if OIIO_GNUC_VERSION >= 110000
OIIO_GCC_ONLY_PRAGMA(GCC diagnostic ignored "-Wstringop-overflow")
Expand Down