Skip to content

Commit

Permalink
Build matrix improvements
Browse files Browse the repository at this point in the history
- Add an initial MacOS 13 build to GitHub Actions.
- Generalize existing support for analysis builds without Python integration.
  • Loading branch information
jstone-lucasfilm committed Jun 12, 2023
1 parent 07311f5 commit 5a2a821
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,14 @@ jobs:
compiler: clang
compiler_version: "14"
python: 3.11
cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
clang_format: ON

- name: Linux_Clang_14_DynamicAnalysis
os: ubuntu-22.04
compiler: clang
compiler_version: "14"
python: None
cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
dynamic_analysis: ON

- name: MacOS_Xcode_11_Python37
Expand All @@ -77,9 +83,9 @@ jobs:
python: 3.9

- name: MacOS_Xcode_14_Python311
os: macos-12
os: macos-13
compiler: xcode
compiler_version: "14.2"
compiler_version: "14.3"
python: 3.11
test_shaders: ON

Expand Down Expand Up @@ -147,6 +153,7 @@ jobs:
Add-Content $env:GITHUB_PATH "$PWD/vcpkg/installed/x64-windows/tools"
- name: Install Python ${{ matrix.python }}
if: matrix.python != 'None'
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
Expand Down Expand Up @@ -192,7 +199,7 @@ jobs:
working-directory: build

- name: Python Tests
if: matrix.dynamic_analysis != 'ON'
if: matrix.python != 'None'
run: |
python MaterialXTest/main.py
python MaterialXTest/genshader.py
Expand Down Expand Up @@ -249,7 +256,7 @@ jobs:
working-directory: build/render

- name: Upload Installed Package
if: matrix.dynamic_analysis != 'ON'
if: matrix.python != 'None'
uses: actions/upload-artifact@v3
with:
name: MaterialX_${{ matrix.name }}
Expand Down

0 comments on commit 5a2a821

Please sign in to comment.