Skip to content

Commit

Permalink
Merge release v24.11
Browse files Browse the repository at this point in the history
  • Loading branch information
pixar-oss committed Oct 25, 2024
2 parents 59992d2 + 238f0b7 commit 9b0c13b
Show file tree
Hide file tree
Showing 2,688 changed files with 139,143 additions and 150,794 deletions.
29 changes: 16 additions & 13 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
### Description of Change(s)

### Link to proposal ([if applicable](https://openusd.org/release/contributing_to_usd.html#step-1-get-consensus-for-major-changes))

### Fixes Issue(s)
-

<!--
Please follow the Contributing and Building guidelines to run tests against your
change. Place an X in the box if tests are run and are all tests passing.
-->
- [ ] I have verified that all unit tests pass with the proposed changes
<!--
Place an X in the box if you have submitted a signed Contributor License Agreement.
A signed CLA must be received before pull requests can be merged.
For instructions, see: http://openusd.org/release/contributing_to_usd.html
-->
- [ ] I have submitted a signed Contributor License Agreement

### Checklist

[ ] I have created this PR based on the dev branch

[ ] I have followed the [coding conventions](https://openusd.org/release/api/_page__coding__guidelines.html)

[ ] I have added unit tests that exercise this functionality (Reference:
[testing guidelines](https://openusd.org/release/api/_page__testing__guidelines.html))

[ ] I have verified that all unit tests pass with the proposed changes

[ ] I have submitted a signed Contributor License Agreement (Reference:
[Contributor License Agreement instructions](https://openusd.org/release/contributing_to_usd.html#contributor-license-agreement))
192 changes: 192 additions & 0 deletions .github/workflows/buildusd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
name: BuildUSD

on:
push:
branches:
- dev
- release
issue_comment:
types: [created]

env:
PYTHON_VERSION: "3.9"
PYTHON_VERSION_MAC: "3.11"

jobs:
GetUser:
runs-on: ubuntu-20.04
timeout-minutes: 5
outputs:
require-result: ${{ steps.check.outputs.require-result }}
steps:
- uses: actions-cool/check-user-permission@v2
id: check
with:
require: 'write'
username: ${{ github.event.comment.user.login }}
GetGitRef:
runs-on: ubuntu-20.04
timeout-minutes: 5
outputs:
ref: ${{ steps.setter.outputs.ref }}
steps:
- name: Get push ref
if: ${{ github.event_name == 'push' }}
run: |
echo "REF=${{ github.ref }}" >> $GITHUB_ENV
- name: Get PR ref
if: ${{ github.event.issue.pull_request }}
run: |
echo "REF=refs/pull/${{ github.event.issue.number }}/merge" >> $GITHUB_ENV
- name: Print ENV_VAR
run: |
echo "The value of REF is $REF"
- name: Set ENV_VAR
id: setter
run: |
echo "ref=$REF" >> "$GITHUB_OUTPUT"
Linux:
needs: [GetUser, GetGitRef]
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
runs-on: ubuntu-20.04
timeout-minutes: 120
steps:
- run: echo ${{ needs.GetUser.outputs.require-result }}
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{needs.GetGitRef.outputs.ref}}
- name: Restore cached artifacts
id: cache-usd-build-dependency
uses: actions/cache/restore@v4
with:
path: |
USDinst
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
check-latest: false
- name: Install dependencies
run: |
sudo apt-get -qq update
sudo apt-get install -y python3-setuptools libglew-dev libxrandr-dev libxcursor-dev libxinerama-dev libxi-dev
pip install --upgrade pip
pip install PySide2 PyOpenGL
- name: Build USD
run: |
python3 build_scripts/build_usd.py --no-materialx --build USDgen/build --src USDgen/src USDinst -v
- name: Save build artifacts to cache
if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
path: |
USDinst
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: usd-linux
path: USDinst

macOS:
needs: [GetUser, GetGitRef]
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
runs-on: macos-13
timeout-minutes: 120
steps:
- run: echo ${{ needs.GetUser.outputs.require-result }}
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{needs.GetGitRef.outputs.ref}}
- name: Restore cached artifacts
id: cache-usd-build-dependency
uses: actions/cache/restore@v4
with:
path: |
USDinst
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION_MAC }}-${{ hashFiles('build_scripts/**/*') }}
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION_MAC }}
check-latest: false
- name: Install dependencies
run: |
export PATH=/Applications/CMake.app/Contents/bin:$PATH
sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
# Set SYSTEM_VERSION_COMPAT while installing Python packages to
# accommodate the macOS version numbering change from 10.x to 11
export SYSTEM_VERSION_COMPAT=1
pip install PySide6 PyOpenGL setuptools
export -n SYSTEM_VERSION_COMPAT
- name: Build USD
run: |
export PATH=/Applications/CMake.app/Contents/bin:$PATH
python3 build_scripts/build_usd.py --no-materialx --generator Xcode --build USDgen/build --src USDgen/src USDinst -v
- name: Save build artifacts to cache
if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
path: |
USDinst
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION_MAC }}-${{ hashFiles('build_scripts/**/*') }}
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: usd-macOS
path: USDinst

Windows:
needs: [GetUser, GetGitRef]
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
runs-on: windows-2019
timeout-minutes: 120
steps:
- run: echo ${{ needs.GetUser.outputs.require-result }}
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{needs.GetGitRef.outputs.ref}}
- name: Restore cached artifacts
id: cache-usd-build-dependency
uses: actions/cache/restore@v4
with:
path: |
USDinst
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
check-latest: false
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install PyOpenGL PySide2
- name: Build USD
run: |
REM Unset BOOST_ROOT on Windows. The VS2017-Win2016 image
REM sets this env var to a pre-installed boost which causes
REM the USD build to favor this over the boost built by
REM build_usd.py. This causes the build to fail, because
REM the pre-installed boost does not include boost_python27
call set BOOST_ROOT=
python build_scripts/build_usd.py --no-materialx --generator "Visual Studio 16 2019" --build USDgen/build --src USDgen/src USDinst --build-args USD,"-DPXR_ENABLE_PRECOMPILED_HEADERS=OFF" -v
shell: cmd
- name: Save build artifacts to cache
if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
path: |
USDinst
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
- name: Upload artifacts
# use v3 because actions/upload-artifact@v4 fails
# see https://github.com/actions/upload-artifact/issues/485
uses: actions/upload-artifact@v3
with:
name: usd-win64
path: USDinst
Loading

0 comments on commit 9b0c13b

Please sign in to comment.