CI updates

Signed-off-by: Nick Avramoussis <[email protected]>
Idclip · Sep 24, 2023 · bc91653 · bc91653
1 parent a46f498
commit bc91653
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ax.yml b/.github/workflows/ax.yml
@@ -61,6 +61,8 @@ jobs:
       matrix:
         # Only test unified builds (core+ax). weekly CI should test standalone
         config:
+          - { image: '2023-clang15', cxx: 'clang++', build: 'Release', cmake: '' }
+          - { image: '2023-clang15', cxx: 'g++',     build: 'Release', cmake: '' }
           - { image: '2022-clang11', cxx: 'clang++', build: 'Debug',   cmake: '' }
           - { image: '2022-clang11', cxx: 'clang++', build: 'Release', cmake: '' }
           - { image: '2022-clang11', cxx: 'g++',     build: 'Release', cmake: '' }

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,6 +70,8 @@ jobs:
     strategy:
       matrix:
         config:
+          - { cxx: clang++, image: '2023-clang15', abi: '10', build: 'Release', cmake: '' }
+          - { cxx: g++,     image: '2023-clang15', abi: '10', build: 'Release', cmake: '' }
           - { cxx: clang++, image: '2022-clang11', abi: '10', build: 'Release', cmake: '' }
           - { cxx: clang++, image: '2022-clang11', abi: '10', build: 'Debug'  , cmake: '' }
           - { cxx: g++,     image: '2022-clang11', abi: '10', build: 'Release', cmake: '' }

diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -67,7 +67,7 @@ jobs:
           - { houdini_version: '19.5', houdini_version_str: '19_5' }
       fail-fast: false
     container:
-      image: aswf/ci-base:2021
+      image: aswf/ci-base:2022
     steps:
     - uses: actions/checkout@v3
     - name: timestamp
@@ -152,7 +152,7 @@ jobs:
         ./ci/build.sh -v
         --build-type=Release
         --components=\"core,python,bin,view,render,test\"
-        --cargs=\"-DOPENVDB_CXX_STRICT=OFF\"
+        --cargs=\"-DOPENVDB_CXX_STRICT=OFF -DCMAKE_CXX_STANDARD=20\"
     - name: test
       shell: bash
       run: cd build && ctest -V
@@ -232,8 +232,9 @@ jobs:
     strategy:
       matrix:
         config:
-          - { cxx: 'clang++', build: 'Release', llvm: '14', dir: '@14' }
-          - { cxx: 'clang++', build: 'Release', llvm: 'latest', dir: '' }
+          - { cxx: 'clang++', build: 'Release', llvm: '14' }
+          - { cxx: 'clang++', build: 'Release', llvm: '15' }
+          #- { cxx: 'clang++', build: 'Release', llvm: '16' } - not supported yet
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -247,7 +248,7 @@ jobs:
           --cargs=\"
           -DOPENVDB_AX_TEST_CMD_DOWNLOADS=ON
           -DUSE_EXPLICIT_INSTANTIATION=OFF
-          -DLLVM_DIR=/usr/local/opt/llvm${{ matrix.config.dir }}/lib/cmake/llvm
+          -DLLVM_DIR=/usr/local/opt/llvm@${{ matrix.config.llvm }}/lib/cmake/llvm
           \"
       - name: test
         run: cd build && ctest -V