Skip to content

Commit

Permalink
Merge pull request #1674 from Idclip/ci
Browse files Browse the repository at this point in the history
CI updates
  • Loading branch information
Idclip authored Oct 3, 2023
2 parents a6064e8 + 664dc5c commit fd5bfe8
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '' }
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,18 @@ jobs:
strategy:
matrix:
config:
- { 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: '' }
- { cxx: clang++, image: '2022-clang11', abi: '9', build: 'Release', cmake: '' }
- { cxx: g++, image: '2022-clang11', abi: '9', build: 'Release', cmake: '' }
- { cxx: clang++, image: '2021', abi: '8', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
- { cxx: g++, image: '2021', abi: '8', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
# @note we specifically use clang15.0 (not clang15) here as the newest
# versions of the clang15.X containers have some issues with the GLFW
# installation
- { cxx: clang++, image: '2023-clang15.0', abi: '10', build: 'Release', cmake: '' }
- { cxx: g++, image: '2023-clang15.0', 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: '' }
- { cxx: clang++, image: '2022-clang11', abi: '9', build: 'Release', cmake: '' }
- { cxx: g++, image: '2022-clang11', abi: '9', build: 'Release', cmake: '' }
- { cxx: clang++, image: '2021', abi: '8', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
- { cxx: g++, image: '2021', abi: '8', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down
27 changes: 14 additions & 13 deletions .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:2023
steps:
- uses: actions/checkout@v3
- name: timestamp
Expand Down Expand Up @@ -128,31 +128,31 @@ jobs:
- name: test
run: cd build && ctest -V

# Test EXR 3 on MacOS
# Test latest dependencies, latest compilers and options through homebrew on macos
macos-latest:
if: |
github.event_name != 'workflow_dispatch' ||
github.event.inputs.type == 'all' ||
github.event.inputs.type == 'mac'
runs-on: macos-12
env:
CXX: clang++
strategy:
matrix:
config:
- { brew_compiler: gcc@13, cmake: '-D CMAKE_CXX_COMPILER=/usr/local/opt/gcc@13/bin/g++-13' }
- { brew_compiler: llvm@16, cmake: '-D CMAKE_CXX_COMPILER=/usr/local/opt/llvm@16/bin/clang++' }
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: install
shell: bash
# brew boost-python3 installs a "Keg-only" version of python which is
# not installed to PATH. We must manually provide the location of the
# required python installation to CMake through a hint variable which
# is exported in install_macos.sh
run: ./ci/install_macos.sh latest
run: ./ci/install_macos.sh latest ${{ matrix.config.brew_compiler }}
- name: build
shell: bash
run: >
./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 ${{ matrix.config.cmake }}\"
- name: test
shell: bash
run: cd build && ctest -V
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions ci/install_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
set -x

brew update

if [ ! -z $2 ]; then
if [[ $2 == "gcc"* || $2 == "llvm"* ]]; then
brew install $2
else
# don't silently succeed
echo "Unknown compiler type/version for second argument to install_macos.sh: $2"
exit -1
fi
fi

brew install bash gnu-getopt # for CI scripts
brew install cmake
brew install boost
Expand Down

0 comments on commit fd5bfe8

Please sign in to comment.