Skip to content

Commit d009183

Browse files
committed
CI: have a clang11 test (#1379)
Along the way, discovered a couple clang-specific warnings when using C++17. Signed-off-by: Larry Gritz <[email protected]>
1 parent fa00aad commit d009183

File tree

3 files changed

+55
-2
lines changed

3 files changed

+55
-2
lines changed

.github/workflows/ci.yml

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
CMAKE_CXX_STANDARD: 17
180180
PYTHON_VERSION: 3.7
181181
USE_SIMD: avx2,f16c
182-
OPENEXR_VERSION: v3.0.1
182+
OPENEXR_VERSION: v3.0.4
183183
OPENIMAGEIO_VERSION: RB-2.2
184184
steps:
185185
- uses: actions/checkout@v2
@@ -321,7 +321,7 @@ jobs:
321321
build/*/CMake*.{txt,log}
322322
323323
linux-clang9-llvm9:
324-
name: "Linux clang9, C++14, llvm9, oiio release, avx, exr2.4, avx"
324+
name: "Linux clang9, C++14, llvm9, oiio release, avx2, exr2.4"
325325
runs-on: ubuntu-18.04
326326
container:
327327
image: aswf/ci-osl:2019-clang9
@@ -368,6 +368,57 @@ jobs:
368368
build/*/testsuite/*/*.*
369369
build/*/CMake*.{txt,log}
370370
371+
linux-clang11-llvm11:
372+
name: "Linux clang11/C++17 llvm-11 oiio-master avx2 exr3.0"
373+
runs-on: ubuntu-latest
374+
container:
375+
image: aswf/ci-osl:2021-clang11
376+
env:
377+
CXX: clang++
378+
CC: clang
379+
CMAKE_CXX_STANDARD: 17
380+
PYTHON_VERSION: 3.7
381+
USE_SIMD: avx2,f16c
382+
OPENEXR_VERSION: v3.0.4
383+
OPENIMAGEIO_VERSION: master
384+
PYBIND11_VERSION: v2.6.2
385+
steps:
386+
- uses: actions/checkout@v2
387+
- name: Prepare ccache timestamp
388+
id: ccache_cache_keys
389+
shell: bash
390+
run: |
391+
echo "::set-output name=date::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
392+
- name: ccache
393+
id: ccache
394+
uses: actions/cache@v2
395+
with:
396+
path: /tmp/ccache
397+
key: ${{ github.job }}-${{ steps.ccache_cache_keys.outputs.date }}
398+
restore-keys: |
399+
${{ github.job }}-
400+
- name: Build setup
401+
run: |
402+
src/build-scripts/ci-startup.bash
403+
- name: Dependencies
404+
run: |
405+
sudo rm -rf /usr/local/include/OpenEXR
406+
sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
407+
src/build-scripts/gh-installdeps.bash
408+
- name: Build
409+
run: |
410+
src/build-scripts/ci-build.bash
411+
- name: Testsuite
412+
run: |
413+
src/build-scripts/ci-test.bash
414+
- uses: actions/upload-artifact@v2
415+
if: failure()
416+
with:
417+
name: ${{ github.job }}
418+
path: |
419+
build/*/testsuite/*/*.*
420+
build/*/CMake*.{txt,log}
421+
371422
linux-2021ish-gcc8-llvm10:
372423
name: "Linux gcc8, C++17, llvm10, oiio master, avx2, exr2.5, avx2"
373424
runs-on: ubuntu-18.04

src/liboslcomp/osllex.l

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ using namespace OSL::pvt;
105105
// flex uses the 'register' keyword, warned because it's deprecated in C++17.
106106
#if defined(__clang__)
107107
#pragma GCC diagnostic ignored "-Wdeprecated-register"
108+
#pragma GCC diagnostic ignored "-Wregister"
108109
#endif
109110
#if OSL_GNUC_VERSION >= 90000
110111
#pragma GCC diagnostic ignored "-Wregister"

src/liboslexec/osolex.l

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ using namespace OSL::pvt;
103103
// flex uses the 'register' keyword, warned because it's deprecated in C++17.
104104
#if defined(__clang__)
105105
#pragma GCC diagnostic ignored "-Wdeprecated-register"
106+
#pragma GCC diagnostic ignored "-Wregister"
106107
#endif
107108
#if OSL_GNUC_VERSION >= 90000
108109
#pragma GCC diagnostic ignored "-Wregister"

0 commit comments

Comments
 (0)