From 272673b1545a249c4347f8a04c17140592aeecd1 Mon Sep 17 00:00:00 2001 From: Jonathan Swartz Date: Tue, 26 Nov 2024 08:44:35 +1300 Subject: [PATCH 1/6] Fix gtest install for rpm. not deb Signed-off-by: Jonathan Swartz --- .github/workflows/ax.yml | 3 +-- .github/workflows/build.yml | 3 +-- .github/workflows/houdini.yml | 3 +-- .github/workflows/nanovdb.yml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ax.yml b/.github/workflows/ax.yml index 015d2d797f..5ec2b59733 100644 --- a/.github/workflows/ax.yml +++ b/.github/workflows/ax.yml @@ -78,8 +78,7 @@ jobs: run: ./ci/install_nanobind.sh 2.0.0 - name: install_gtest run: | - sudo apt-get update - sudo apt-get -q install -y libgtest-dev + sudo yum install -y gtest-devel - name: timestamp id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bda68101e..a36dbb8f6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,8 +91,7 @@ jobs: run: ./ci/install_glfw.sh 3.3.10 - name: install_gtest run: | - sudo apt-get update - sudo apt-get -q install -y libgtest-dev + sudo yum install -y gtest-devel - name: timestamp id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 5b9c512fc1..79ceb063eb 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -95,8 +95,7 @@ jobs: run: ./ci/install_cppunit.sh 1.15.1 - name: install_gtest run: | - sudo apt-get update - sudo apt-get -q install -y libgtest-dev + sudo yum install -y gtest-devel - name: timestamp id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml index 43b2c233d9..0b19fc7023 100644 --- a/.github/workflows/nanovdb.yml +++ b/.github/workflows/nanovdb.yml @@ -174,8 +174,7 @@ jobs: - uses: actions/checkout@v3 - name: install_gtest run: | - sudo apt-get update - sudo apt-get -q install -y libgtest-dev + sudo yum install -y gtest-devel - name: build_and_test run: | cd nanovdb/nanovdb From 11dc8305dd4b383a395135a01d5ae17cfdcd4324 Mon Sep 17 00:00:00 2001 From: Jonathan Swartz Date: Tue, 26 Nov 2024 09:08:44 +1300 Subject: [PATCH 2/6] Building gtest from source; newer version required than available on distro Signed-off-by: Jonathan Swartz --- .github/workflows/ax.yml | 3 +-- .github/workflows/build.yml | 3 +-- .github/workflows/houdini.yml | 3 +-- .github/workflows/nanovdb.yml | 5 +++-- ci/install_gtest.sh | 16 ++++++++++++++++ 5 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 ci/install_gtest.sh diff --git a/.github/workflows/ax.yml b/.github/workflows/ax.yml index 5ec2b59733..be512fbc2c 100644 --- a/.github/workflows/ax.yml +++ b/.github/workflows/ax.yml @@ -77,8 +77,7 @@ jobs: #if: contains(matrix.config.image, '2023') == false run: ./ci/install_nanobind.sh 2.0.0 - name: install_gtest - run: | - sudo yum install -y gtest-devel + run: ./ci/install_gtest.sh 1.15.2 - name: timestamp id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a36dbb8f6c..6d479e57a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,8 +90,7 @@ jobs: if: contains(matrix.config.image, '2023') == true run: ./ci/install_glfw.sh 3.3.10 - name: install_gtest - run: | - sudo yum install -y gtest-devel + run: ./ci/install_gtest.sh 1.15.2 - name: timestamp id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 79ceb063eb..28efc703b8 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -94,8 +94,7 @@ jobs: - name: cppunit run: ./ci/install_cppunit.sh 1.15.1 - name: install_gtest - run: | - sudo yum install -y gtest-devel + run: ./ci/install_gtest.sh 1.15.2 - name: timestamp id: timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml index 0b19fc7023..0efc4580a8 100644 --- a/.github/workflows/nanovdb.yml +++ b/.github/workflows/nanovdb.yml @@ -170,11 +170,12 @@ jobs: github.event.inputs.type == 'all' || github.event.inputs.type == 'linux' runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-8c-32g-300h') || 'ubuntu-latest' }} + container: + image: aswf/ci-openvdb:2024 steps: - uses: actions/checkout@v3 - name: install_gtest - run: | - sudo yum install -y gtest-devel + run: ./ci/install_gtest.sh 1.15.2 - name: build_and_test run: | cd nanovdb/nanovdb diff --git a/ci/install_gtest.sh b/ci/install_gtest.sh new file mode 100644 index 0000000000..71d7fbd7bb --- /dev/null +++ b/ci/install_gtest.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -ex + +GTEST_VERSION="$1" + + +git clone https://github.com/google/googletest.git -b v${GTEST_VERSION} +cd googletest +mkdir build +cd build +cmake .. + +make -j$(nproc) + +sudo make install From d59f40d6710f56ed2082d3b230e733c995e963f2 Mon Sep 17 00:00:00 2001 From: Jonathan Swartz Date: Tue, 26 Nov 2024 09:15:10 +1300 Subject: [PATCH 3/6] permissions fix Signed-off-by: Jonathan Swartz --- ci/install_gtest.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/install_gtest.sh diff --git a/ci/install_gtest.sh b/ci/install_gtest.sh old mode 100644 new mode 100755 From 51373adf61ccde1169ecae5d0a2fc7cf1ccaf82e Mon Sep 17 00:00:00 2001 From: Jonathan Swartz Date: Tue, 26 Nov 2024 09:43:08 +1300 Subject: [PATCH 4/6] Attempting to fix doxygen node version issue Missing iomanip include in TestNanoVDB Signed-off-by: Jonathan Swartz --- .github/workflows/docs.yml | 3 --- nanovdb/nanovdb/unittest/TestNanoVDB.cc | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1fff84b892..ac8ace0b79 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -42,9 +42,6 @@ jobs: # need to re-write the python docs to use sphinx image: aswf/ci-openvdb:2022 steps: - - name: Enable Node 16 - run: | - echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV - uses: actions/checkout@v3 - name: install_doxygen run: ./ci/install_doxygen.sh 1_8_11 diff --git a/nanovdb/nanovdb/unittest/TestNanoVDB.cc b/nanovdb/nanovdb/unittest/TestNanoVDB.cc index 7eacd07915..33e120c063 100644 --- a/nanovdb/nanovdb/unittest/TestNanoVDB.cc +++ b/nanovdb/nanovdb/unittest/TestNanoVDB.cc @@ -4,6 +4,7 @@ // Uncomment to temporarily disable testing of PNanoVDB //#define DISABLE_PNANOVDB +#include #include #include #include // for std::stringstream From 76d79d832d2a310b5a75d2449b361c5efed65eeb Mon Sep 17 00:00:00 2001 From: Jonathan Swartz Date: Tue, 26 Nov 2024 09:59:41 +1300 Subject: [PATCH 5/6] Bump container versions attempt to fix doxygen test Signed-off-by: Jonathan Swartz --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ac8ace0b79..df08f1f94f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -40,9 +40,9 @@ jobs: container: # @note We can't update this as epydoc doesn't support python3. We'll # need to re-write the python docs to use sphinx - image: aswf/ci-openvdb:2022 + image: aswf/ci-openvdb:2024 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install_doxygen run: ./ci/install_doxygen.sh 1_8_11 - name: nanobind From bf292f5eccb61a91cdda88b4822141ed0babc17b Mon Sep 17 00:00:00 2001 From: Jonathan Swartz Date: Tue, 26 Nov 2024 10:14:21 +1300 Subject: [PATCH 6/6] install_latex fix Signed-off-by: Jonathan Swartz --- .github/workflows/docs.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index df08f1f94f..617ae20a12 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -52,10 +52,6 @@ jobs: # run: pip install epydoc - name: install_latex run: | - # Fix error: Cannot prepare internal mirrorlist: No URLs in mirrorlist. CentOS 8 reached EOL means need to replace the official mirror to vault.centos.org - # Comment out mirrorlist and replace #baseurl=...mirror.centos.org with baseurl=...vault.centos.org in files starting with CentOS- in /etc/yum.repos.d folder - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* yum -y install texlive-latex-bin texlive-dvips texlive-collection-fontsrecommended texlive-collection-latexrecommended - name: build run: >