Skip to content

Commit

Permalink
Updates to GitHub CI (AcademySoftwareFoundation#2050)
Browse files Browse the repository at this point in the history
- Move static analysis testing to MacOS 14, which is a more optimized environment and has a more recent version of cppcheck.
- Upgrade to MacOS 13, as the MacOS 12 environment is now considered deprecated in GitHub CI.
  • Loading branch information
jstone-lucasfilm authored Oct 6, 2024
1 parent a11792a commit 8357e14
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:
compiler: gcc
compiler_version: "14"
python: 3.12
static_analysis: ON
cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

- name: Linux_GCC_CoverageAnalysis
os: ubuntu-24.04
Expand All @@ -63,10 +61,10 @@ jobs:
test_render: ON
clang_format: ON

- name: MacOS_Xcode_13_Python39
os: macos-12
- name: MacOS_Xcode_14_Python39
os: macos-13
compiler: xcode
compiler_version: "13.1"
compiler_version: "14.1"
cmake_config: -DMATERIALX_BUILD_SHARED_LIBS=ON
python: 3.9

Expand All @@ -75,6 +73,8 @@ jobs:
compiler: xcode
compiler_version: "14.3"
python: 3.11
static_analysis: ON
cmake_config: -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

- name: MacOS_Xcode_15_Python312
os: macos-14
Expand Down Expand Up @@ -245,10 +245,14 @@ jobs:
working-directory: build

- name: Static Analysis Tests
if: matrix.static_analysis == 'ON' && runner.os == 'Linux'
if: matrix.static_analysis == 'ON'
run: |
sudo apt-get install cppcheck
cppcheck --project=build/compile_commands.json --error-exitcode=1 --suppress=*:*/External/* --suppress=*:*/NanoGUI/*
if [ "${{ runner.os }}" = "Linux" ]; then
sudo apt-get install cppcheck
else
brew install cppcheck
fi
cppcheck --project=build/compile_commands.json --error-exitcode=1 --suppress=normalCheckLevelMaxBranches --suppress=*:*/External/* --suppress=*:*/NanoGUI/*
- name: Initialize Virtual Framebuffer
if: matrix.test_render == 'ON' && runner.os == 'Linux'
Expand Down

0 comments on commit 8357e14

Please sign in to comment.