Bumped the 'latest' CI tests

Signed-off-by: Nick Avramoussis <[email protected]>
AcademySoftwareFoundation · Oct 9, 2023 · 7b98345 · 7b98345
1 parent 14d9955
commit 7b98345
Showing 1 changed file with 35 additions and 30 deletions.
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -12,7 +12,7 @@ on:
   workflow_dispatch:
     inputs:
       type:
-        description: 'The type of CI to run (all, houdini, mac, extra, ax, blosc, abi)'
+        description: 'The type of CI to run (all, houdini, latest, extra, ax, blosc, abi)'
         required: true
         default: 'all'
 
@@ -21,6 +21,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   #############################################################################
   ################################## Houdini ##################################
@@ -72,7 +76,6 @@ jobs:
     - uses: actions/checkout@v3
     - name: timestamp
       id: timestamp
-      shell: bash
       run: echo "::set-output name=timestamp::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
     - name: download_houdini
       run: ./ci/download_houdini.sh ${{ matrix.config.houdini_version }} ON
@@ -131,36 +134,43 @@ jobs:
     - name: test
       run: cd build && ctest -V
 
-  # Test latest dependencies, latest compilers and options through homebrew on macos
-  macos-latest:
+  # Test latest dependencies, latest compilers and options
+  latest:
     if: |
       github.event_name != 'workflow_dispatch' ||
       github.event.inputs.type == 'all' ||
-      github.event.inputs.type == 'mac'
-    runs-on: macos-12
+      github.event.inputs.type == 'latest'
+    runs-on: ${{ matrix.config.runson }}
+    env:
+      CXX: ${{ matrix.config.cxx }}
     strategy:
       matrix:
         config:
-          # Don't link against boost on macos with GCC, there are some symbol issues
-          # with brew using clang to build its dependencies vs us trying to use GCC
-          - { brew_compiler: gcc@13,  cmake: '-D CMAKE_CXX_COMPILER=/usr/local/opt/gcc@13/bin/g++-13 -DOPENVDB_USE_DELAYED_LOADING=OFF' }
-          - { brew_compiler: llvm@16, cmake: '-D CMAKE_CXX_COMPILER=/usr/local/opt/llvm@16/bin/clang++' }
+          - { runson: ubuntu-latest, cxx: g++,     cmake: '' }
+          - { runson: ubuntu-latest, cxx: clang++, cmake: '' }
+          # @todo gcc on macos
+          - { runson: macos-latest,  cxx: '',      cmake: '-D CMAKE_CXX_COMPILER=/usr/local/opt/llvm@15/bin/clang++' }
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
-    - name: install
-      shell: bash
-      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 -DCMAKE_CXX_STANDARD=20 ${{ matrix.config.cmake }}\"
-    - name: test
-      shell: bash
-      run: cd build && ctest -V
+      - uses: actions/checkout@v3
+      - name: install_deps
+        run: |
+          if [ "$RUNNER_OS" == "Linux" ]; then
+            sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev llvm-dev libgtest-dev libcppunit-dev pybind11-dev
+          elif [ "$RUNNER_OS" == "macOS" ]; then
+            ./ci/install_macos_ax.sh 15
+            brew install googletest
+          else
+            echo "$RUNNER_OS not supported"; exit 1
+          fi
+      - name: build
+        run: >
+          ./ci/build.sh -v
+          --build-type=Release
+          --components=\"core,axcore,python,bin,render,test,axtest,axbin\"
+          --cargs=\"-DCMAKE_CXX_STANDARD=20 -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install ${{ matrix.config.cmake }}\"
+      - name: test
+        run: cd build && ctest -V
 
   #############################################################################
   ############################ AX Library Extras ##############################
@@ -290,16 +300,13 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: llvm
-      shell: bash
       run: ./ci/install_llvm_windows.sh ${{ matrix.config.crt }}
     - name: install
-      shell: bash
       run: |
         vcpkg update
         vcpkg install zlib tbb cppunit blosc python3 \
           boost-iostreams boost-system boost-any boost-uuid boost-interprocess boost-algorithm pybind11
     - name: build
-      shell: bash
       run: >
         ./ci/build.sh -v
         --config=${{ matrix.config.build }}
@@ -322,7 +329,6 @@ jobs:
         echo "$Env:VCPKG_INSTALLATION_ROOT\installed\${{ matrix.config.vc }}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "$Env:VDB_INSTALL_PREFIX\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: test
-      shell: bash
       run: cd build && ctest -V -C ${{ matrix.config.build }}
 
   #############################################################################
@@ -345,7 +351,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: install_blosc
-      shell: bash
       run: sudo ./ci/install_blosc.sh ${{ matrix.blosc }}
     - name: build
       run: >
@@ -374,7 +379,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: install_deps
-      run: sudo apt-get -q install -y libboost-dev libboost-system-dev libboost-iostreams-dev libtbb-dev libblosc-dev elfutils
+      run: sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev elfutils
     # abi-compliance-checker and abi-dumper
     #
     # @note that abi-dumper is available through apt but at the time of writing this