Skip to content

Commit 29dd88e

Browse files
IdclipIdclip
authored
Merge pull request #2077 from Idclip/ci_fixes
CI Fixes
2 parents cbe458c + ef3f85d commit 29dd88e

File tree

7 files changed

+51
-49
lines changed

7 files changed

+51
-49
lines changed

‎.github/workflows/ax.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ jobs:
6868
# Only test unified builds (core+ax). weekly CI should test standalone
6969
# @note LLVM 17 builds are incompatible with the vdb python plugin on linux
7070
config:
71-
- { image: '2025-clang19', cxx: 'clang++', build: 'Release', cmake: '' }
72-
- { image: '2025-clang19', cxx: 'g++', build: 'Release', cmake: '' }
73-
- { image: '2025-clang19', cxx: 'clang++', build: 'Debug', cmake: '' }
74-
- { image: '2025-clang18', cxx: 'clang++', build: 'Release', cmake: '' }
75-
- { image: '2024-clang17', cxx: 'clang++', build: 'Release', cmake: '-DOPENVDB_PYTHON_USE_AX=OFF' }
76-
- { image: '2024-clang16', cxx: 'clang++', build: 'Release', cmake: '' }
77-
- { image: '2023-clang15', cxx: 'clang++', build: 'Release', cmake: '' }
78-
- { image: '2023-clang15', cxx: 'g++', build: 'Release', cmake: '' }
71+
- { image: '2025-clang19.1', cxx: 'clang++', build: 'Release', cmake: '' }
72+
- { image: '2025-clang19.1', cxx: 'g++', build: 'Release', cmake: '' }
73+
- { image: '2025-clang19.1', cxx: 'clang++', build: 'Debug', cmake: '' }
74+
- { image: '2025-clang18.1', cxx: 'clang++', build: 'Release', cmake: '' }
75+
- { image: '2024-clang17.2', cxx: 'clang++', build: 'Release', cmake: '-DOPENVDB_PYTHON_USE_AX=OFF' }
76+
- { image: '2024-clang16.2', cxx: 'clang++', build: 'Release', cmake: '' }
77+
- { image: '2023-clang15', cxx: 'clang++', build: 'Release', cmake: '' }
78+
- { image: '2023-clang15', cxx: 'g++', build: 'Release', cmake: '' }
7979
fail-fast: false
8080
steps:
8181
- uses: actions/checkout@v3
@@ -160,7 +160,7 @@ jobs:
160160
github.event.inputs.type == 'grammar'
161161
runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
162162
container:
163-
image: aswf/ci-openvdb:2023-clang15
163+
image: aswf/ci-openvdb:2025-clang19.1
164164
steps:
165165
- uses: actions/checkout@v3
166166
- name: build

‎.github/workflows/build.yml

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@ on:
3333
- 'pendingchanges/**'
3434
- '**.md'
3535
schedule:
36-
# run this workflow every day at 7am UTC except Monday
37-
- cron: '0 7 * * 0,2-6'
38-
# run this workflow Monday 7am UTC
39-
# warning: This pattern is checked in various places below
40-
- cron: '0 7 * * 1'
36+
# run this workflow every day 7am UTC
37+
- cron: '0 7 * * *'
4138
workflow_dispatch:
4239
inputs:
4340
type:
@@ -64,10 +61,7 @@ jobs:
6461
github.event.inputs.type == 'linux'
6562
runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
6663
name: >
67-
linux-vfx:${{ matrix.config.image }}-
68-
abi:${{ matrix.config.abi }}-
69-
cxx:${{ matrix.config.cxx }}-
70-
type:${{ matrix.config.build }}
64+
linux:${{ matrix.config.image }}-abi:${{ matrix.config.abi }}-cxx:${{ matrix.config.cxx }}-type:${{ matrix.config.build }}
7165
container:
7266
image: aswf/ci-openvdb:${{ matrix.config.image }}
7367
env:
@@ -76,21 +70,16 @@ jobs:
7670
strategy:
7771
matrix:
7872
config:
79-
- { cxx: clang++, image: '2024', abi: '12', build: 'Release', cmake: '' }
80-
- { cxx: g++, image: '2024', abi: '12', build: 'Release', cmake: '' }
81-
- { cxx: clang++, image: '2024', abi: '12', build: 'Debug', cmake: '' }
82-
- { cxx: clang++, image: '2023', abi: '11', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
83-
- { cxx: g++, image: '2023', abi: '11', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
73+
- { cxx: clang++, image: '2025-clang19.1', abi: '12', build: 'Release', cmake: '' }
74+
- { cxx: g++, image: '2025-clang19.1', abi: '12', build: 'Release', cmake: '' }
75+
- { cxx: clang++, image: '2025-clang19.1', abi: '12', build: 'Debug', cmake: '' }
76+
- { cxx: clang++, image: '2024-clang17.2', abi: '11', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
77+
- { cxx: g++, image: '2024-clang17.2', abi: '11', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
8478
fail-fast: false
8579
steps:
8680
- uses: actions/checkout@v3
8781
- name: nanobind
8882
run: ./ci/install_nanobind.sh 2.0.0
89-
- name: glfw
90-
if: contains(matrix.config.image, '2023') == true
91-
run: ./ci/install_glfw.sh 3.3.10
92-
- name: install_gtest
93-
run: ./ci/install_gtest.sh 1.15.2
9483
- name: timestamp
9584
id: timestamp
9685
run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
@@ -114,9 +103,8 @@ jobs:
114103
-DOPENVDB_ABI_VERSION_NUMBER=${{ matrix.config.abi }}
115104
\"
116105
- name: test
117-
# Always run tests on weekly builds but skip Debug on commits as they take a while.
118-
# https://github.community/t/distinct-job-for-each-schedule/17811/2
119-
if: contains(github.event.schedule, '0 7 * * 1') || matrix.config.build == 'Release'
106+
# Skip Debug on commits as they take a while.
107+
if: github.event_name == 'schedule'|| matrix.config.build == 'Release'
120108
run: |
121109
cd build && ctest -V
122110
cd - && ./ci/test_install.sh
@@ -172,9 +160,16 @@ jobs:
172160
github.event_name != 'workflow_dispatch' ||
173161
github.event.inputs.type == 'all' ||
174162
github.event.inputs.type == 'mac'
175-
runs-on: macos-13 # Last macos runner befor M1 (macos-14)
163+
runs-on: ${{ matrix.config.image }}
164+
name: ${{ matrix.config.image }}
176165
env:
177166
CXX: clang++
167+
strategy:
168+
matrix:
169+
config:
170+
- { image: macos-13 } # Last macos runner befor M1 (macos-14)
171+
- { image: macos-14 }
172+
- { image: macos-15 }
178173
steps:
179174
- uses: actions/checkout@v3
180175
- name: install
@@ -191,3 +186,4 @@ jobs:
191186
\'
192187
- name: test
193188
run: cd build && ctest -V
189+

‎.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
github.event.inputs.deploy == 'coverage'
107107
runs-on: ubuntu-latest
108108
container:
109-
image: aswf/ci-openvdb:2023
109+
image: aswf/ci-openvdb:2025-clang19.1
110110
env:
111111
CXX: g++
112112
steps:

‎.github/workflows/houdini.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz
164164
cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
165165
- name: install_deps
166-
run: ./ci/install_macos.sh 15
166+
run: ./ci/install_macos.sh 20
167167
- name: build
168168
run: |
169169
./ci/build.sh -v \
@@ -177,7 +177,7 @@ jobs:
177177
-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \
178178
-DUSE_EXPLICIT_INSTANTIATION=OFF \
179179
-DTbb_INCLUDE_DIR=$HOME/houdini_install/hou/Frameworks/Houdini.framework/Versions/Current/Resources/toolkit/include/tbb \
180-
-DLLVM_DIR=/opt/homebrew/opt/llvm@15/lib/cmake/llvm \
180+
-DLLVM_DIR=/opt/homebrew/opt/llvm@20/lib/cmake/llvm \
181181
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \
182182
\"
183183
- name: test

‎.github/workflows/nanovdb.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ jobs:
6161
strategy:
6262
matrix:
6363
config:
64-
- { cxx: g++, image: '2024', build: 'Release' }
65-
- { cxx: g++, image: '2024', build: 'Debug' }
66-
- { cxx: clang++, image: '2024', build: 'Release' }
67-
- { cxx: clang++, image: '2024', build: 'Debug' }
64+
- { cxx: g++, image: '2024-clang17.2', build: 'Release' }
65+
- { cxx: g++, image: '2024-clang17.2', build: 'Debug' }
66+
- { cxx: clang++, image: '2024-clang17.2', build: 'Release' }
67+
- { cxx: clang++, image: '2024-clang17.2', build: 'Debug' }
6868
fail-fast: false
6969
steps:
7070
- uses: actions/checkout@v3
@@ -175,7 +175,7 @@ jobs:
175175
github.event.inputs.type == 'linux'
176176
runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
177177
container:
178-
image: aswf/ci-openvdb:2024
178+
image: aswf/ci-openvdb:2024-clang17.2
179179
steps:
180180
- uses: actions/checkout@v3
181181
- name: install_gtest

‎.github/workflows/weekly.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
150150
name: linux-extra:${{ matrix.config.name }}
151151
container:
152-
image: aswf/ci-openvdb:2024
152+
image: aswf/ci-openvdb:2024-clang17.2
153153
env:
154154
CXX: clang++
155155
strategy:
@@ -192,7 +192,8 @@ jobs:
192192
strategy:
193193
matrix:
194194
config:
195-
- { runson: ubuntu-latest, cxx: g++, cmake: '' }
195+
# llvm-17 is currently the default which has symbol issues with the python module
196+
- { runson: ubuntu-latest, cxx: g++, cmake: '-DOPENVDB_PYTHON_USE_AX=OFF' }
196197
# Disable the clang job for now. See https://github.com/actions/runner-images/issues/8659
197198
# - { runson: ubuntu-latest, cxx: clang++, cmake: '' }
198199
# @todo gcc on macos
@@ -203,7 +204,7 @@ jobs:
203204
- name: install_deps
204205
run: |
205206
if [ "$RUNNER_OS" == "Linux" ]; then
206-
sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev llvm-dev libgtest-dev libgmock-dev libcppunit-dev
207+
sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev libgtest-dev libgmock-dev libcppunit-dev
207208
./ci/install_nanobind.sh 2.0.0
208209
elif [ "$RUNNER_OS" == "macOS" ]; then
209210
./ci/install_macos.sh 20
@@ -216,7 +217,12 @@ jobs:
216217
./ci/build.sh -v
217218
--build-type=Release
218219
--components=\"core,axcore,python,bin,render,test,axbin\"
219-
--cargs=\"-DCMAKE_CXX_STANDARD=20 -DOPENVDB_USE_DELAYED_LOADING=OFF -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install ${{ matrix.config.cmake }}\"
220+
--cargs=\'
221+
-DCMAKE_CXX_STANDARD=20
222+
-DOPENVDB_USE_DELAYED_LOADING=OFF
223+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
224+
${{ matrix.config.cmake }}
225+
\'
220226
- name: test
221227
run: cd build && ctest -V
222228

@@ -295,8 +301,8 @@ jobs:
295301
matrix:
296302
config:
297303
# Unified
298-
- { image: '2025-clang19', cxx: 'clang++', build: 'Release', components: 'core,axcore,axbin,axtest', cmake: '' }
299-
- { image: '2025-clang19', cxx: 'g++', build: 'Release', components: 'core,axcore,axbin,axtest', cmake: '' }
304+
- { image: '2025-clang19.1', cxx: 'clang++', build: 'Release', components: 'core,axcore,axbin,axtest', cmake: '' }
305+
- { image: '2025-clang19.1', cxx: 'g++', build: 'Release', components: 'core,axcore,axbin,axtest', cmake: '' }
300306
fail-fast: false
301307
steps:
302308
- uses: actions/checkout@v3
@@ -507,7 +513,7 @@ jobs:
507513
runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
508514
name: linux-blosc:${{ matrix.blosc }}
509515
container:
510-
image: aswf/ci-base:2023
516+
image: aswf/ci-openvdb:2025-clang19.1
511517
strategy:
512518
matrix:
513519
blosc: ['1.18.0','1.19.0','1.20.0','1.21.0']

‎openvdb_ax/openvdb_ax/compiler/Logger.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ bool Logger::error(const std::string& message,
194194
// Always increment the error counter
195195
++mNumErrors;
196196
if (limit) return false;
197-
mErrorOutput(format(this->getErrorPrefix() + message,
197+
mErrorOutput(ax::format(this->getErrorPrefix() + message,
198198
lineCol,
199199
this->errors(),
200200
this->getNumberedOutput(),
@@ -218,7 +218,7 @@ bool Logger::warning(const std::string& message,
218218
}
219219
else {
220220
++mNumWarnings;
221-
mWarningOutput(format(this->getWarningPrefix() + message,
221+
mWarningOutput(ax::format(this->getWarningPrefix() + message,
222222
lineCol,
223223
this->warnings(),
224224
this->getNumberedOutput(),

0 commit comments

Comments
 (0)