Skip to content

Commit bc66e85

Browse files
committed
CI gcc and llvm testing changes (#1381)
* Update the "bleeding edge" CI test to gcc-11, and also LLVM 12, which we hadn't tested before. * A "latest releases" CI test uses gcc10 and LLVM 11. * Turns out that nothing else on the OSL side needed to be fixed to accommodate gcc 11 (though you need a very up-to-date OIIO if you want to compile it with gcc11 unless you turn warnings off). Signed-off-by: Larry Gritz <[email protected]>
1 parent 8e65cd9 commit bc66e85

File tree

4 files changed

+60
-4
lines changed

4 files changed

+60
-4
lines changed

.github/workflows/ci.yml

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,10 @@ jobs:
467467
build/*/testsuite/*/*.*
468468
build/*/CMake*.{txt,log}
469469
470-
linux-bleeding-edge:
470+
linux-latest-release:
471471
# Test against development master for relevant dependencies, latest
472472
# supported releases of everything else.
473-
name: "Linux bleeding edge: gcc10, C++17, llvm11, oiio/ocio/exr/pybind-master, avx2"
473+
name: "Linux latest releases: gcc10, C++17, llvm11, avx2"
474474
runs-on: ubuntu-20.04
475475
env:
476476
CXX: g++-10
@@ -479,6 +479,60 @@ jobs:
479479
LLVM_VERSION: 11.0.0
480480
LLVM_DISTRO_NAME: ubuntu-20.04
481481
USE_SIMD: avx2,f16c
482+
OPENEXR_VERSION: v3.0.4
483+
OPENIMAGEIO_VERSION: master
484+
OPENIMAGEIO_CMAKE_FLAGS: -DBUILD_FMT_VERSION=7.1.3
485+
OPENCOLORIO_VERSION: v2.0.1
486+
PYBIND11_VERSION: v2.6.2
487+
PUGIXML_VERSION: v1.11.4
488+
PYTHON_VERSION: 3.8
489+
steps:
490+
- uses: actions/checkout@v2
491+
- name: Prepare ccache timestamp
492+
id: ccache_cache_keys
493+
shell: bash
494+
run: |
495+
echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
496+
- name: ccache
497+
id: ccache
498+
uses: actions/cache@v2
499+
with:
500+
path: /tmp/ccache
501+
key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
502+
restore-keys: |
503+
${{ github.job }}-
504+
- name: Build setup
505+
run: |
506+
src/build-scripts/ci-startup.bash
507+
- name: Dependencies
508+
run: |
509+
src/build-scripts/gh-installdeps.bash
510+
- name: Build
511+
run: |
512+
src/build-scripts/ci-build.bash
513+
- name: Testsuite
514+
run: |
515+
src/build-scripts/ci-test.bash
516+
- uses: actions/upload-artifact@v2
517+
if: failure()
518+
with:
519+
name: ${{ github.job }}
520+
path: |
521+
build/*/testsuite/*/*.*
522+
build/*/CMake*.{txt,log}
523+
524+
linux-bleeding-edge:
525+
# Test against development master for relevant dependencies, latest
526+
# supported releases of everything else.
527+
name: "Linux bleeding edge: gcc11, C++17, llvm12, oiio/ocio/exr/pybind-master, avx2"
528+
runs-on: ubuntu-20.04
529+
env:
530+
CXX: g++-11
531+
USE_CPP: 17
532+
CMAKE_CXX_STANDARD: 17
533+
LLVM_VERSION: 12.0.0
534+
LLVM_DISTRO_NAME: ubuntu-20.04
535+
USE_SIMD: avx2,f16c
482536
OPENEXR_VERSION: master
483537
OPENIMAGEIO_VERSION: master
484538
OPENIMAGEIO_CMAKE_FLAGS: -DBUILD_FMT_VERSION=master

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ NEW or CHANGED dependencies since the last major release are **bold**.
1515
* Build system: [CMake](https://cmake.org/) 3.12 or newer (tested through 3.20)
1616

1717
* A suitable C++11 compiler to build OSL itself, which may be any of:
18-
- GCC 4.8.5 or newer (tested through gcc 10)
18+
- GCC 4.8.5 or newer (tested through gcc 11)
1919
- Clang 3.4 or newer (tested through clang 12)
2020
- Microsoft Visual Studio 2015 or newer
2121
- Intel C++ compiler icc version 13 (?) or newer

src/build-scripts/build_llvm.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [[ `uname` == "Linux" ]] ; then
2929
fi
3030
LLVMTAR=clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-${LLVM_DISTRO_NAME}.tar.xz
3131
echo LLVMTAR = $LLVMTAR
32-
if [[ "$LLVM_VERSION" == "10.0.0" ]] || [[ "$LLVM_VERSION" == "11.0.0" ]] ; then
32+
if [[ "$LLVM_VERSION" == "10.0.0" ]] || [[ "$LLVM_VERSION" == "11.0.0" ]] || [[ "$LLVM_VERSION" == "11.1.0" ]] || [[ "$LLVM_VERSION" == "12.0.0" ]] ; then
3333
# new
3434
curl --location https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR
3535
else

src/build-scripts/gh-installdeps.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ else
5555
time sudo apt-get install -y g++-9
5656
elif [[ "$CXX" == "g++-10" ]] ; then
5757
time sudo apt-get install -y g++-10
58+
elif [[ "$CXX" == "g++-11" ]] ; then
59+
time sudo apt-get install -y g++-11
5860
fi
5961

6062
source src/build-scripts/build_llvm.bash

0 commit comments

Comments
 (0)