Skip to content

Commit 9b0c13b

Browse files
pixar-osspixar-oss
committed
Merge release v24.11
2 parents 59992d2 + 238f0b7 commit 9b0c13b

File tree

2,688 files changed

+139143
-150794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,688 files changed

+139143
-150794
lines changed

‎.github/pull_request_template.md‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
### Description of Change(s)
22

3+
### Link to proposal ([if applicable](https://openusd.org/release/contributing_to_usd.html#step-1-get-consensus-for-major-changes))
4+
35
### Fixes Issue(s)
4-
-
5-
6-
<!--
7-
Please follow the Contributing and Building guidelines to run tests against your
8-
change. Place an X in the box if tests are run and are all tests passing.
9-
-->
10-
- [ ] I have verified that all unit tests pass with the proposed changes
11-
<!--
12-
Place an X in the box if you have submitted a signed Contributor License Agreement.
13-
A signed CLA must be received before pull requests can be merged.
14-
For instructions, see: http://openusd.org/release/contributing_to_usd.html
15-
-->
16-
- [ ] I have submitted a signed Contributor License Agreement
6+
7+
### Checklist
8+
9+
[ ] I have created this PR based on the dev branch
10+
11+
[ ] I have followed the [coding conventions](https://openusd.org/release/api/_page__coding__guidelines.html)
12+
13+
[ ] I have added unit tests that exercise this functionality (Reference:
14+
[testing guidelines](https://openusd.org/release/api/_page__testing__guidelines.html))
15+
16+
[ ] I have verified that all unit tests pass with the proposed changes
17+
18+
[ ] I have submitted a signed Contributor License Agreement (Reference:
19+
[Contributor License Agreement instructions](https://openusd.org/release/contributing_to_usd.html#contributor-license-agreement))

‎.github/workflows/buildusd.yml‎

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
name: BuildUSD
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
- release
8+
issue_comment:
9+
types: [created]
10+
11+
env:
12+
PYTHON_VERSION: "3.9"
13+
PYTHON_VERSION_MAC: "3.11"
14+
15+
jobs:
16+
GetUser:
17+
runs-on: ubuntu-20.04
18+
timeout-minutes: 5
19+
outputs:
20+
require-result: ${{ steps.check.outputs.require-result }}
21+
steps:
22+
- uses: actions-cool/check-user-permission@v2
23+
id: check
24+
with:
25+
require: 'write'
26+
username: ${{ github.event.comment.user.login }}
27+
GetGitRef:
28+
runs-on: ubuntu-20.04
29+
timeout-minutes: 5
30+
outputs:
31+
ref: ${{ steps.setter.outputs.ref }}
32+
steps:
33+
- name: Get push ref
34+
if: ${{ github.event_name == 'push' }}
35+
run: |
36+
echo "REF=${{ github.ref }}" >> $GITHUB_ENV
37+
- name: Get PR ref
38+
if: ${{ github.event.issue.pull_request }}
39+
run: |
40+
echo "REF=refs/pull/${{ github.event.issue.number }}/merge" >> $GITHUB_ENV
41+
- name: Print ENV_VAR
42+
run: |
43+
echo "The value of REF is $REF"
44+
- name: Set ENV_VAR
45+
id: setter
46+
run: |
47+
echo "ref=$REF" >> "$GITHUB_OUTPUT"
48+
Linux:
49+
needs: [GetUser, GetGitRef]
50+
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
51+
runs-on: ubuntu-20.04
52+
timeout-minutes: 120
53+
steps:
54+
- run: echo ${{ needs.GetUser.outputs.require-result }}
55+
- name: Checkout code
56+
uses: actions/checkout@v4
57+
with:
58+
ref: ${{needs.GetGitRef.outputs.ref}}
59+
- name: Restore cached artifacts
60+
id: cache-usd-build-dependency
61+
uses: actions/cache/restore@v4
62+
with:
63+
path: |
64+
USDinst
65+
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
66+
- name: Install Python
67+
uses: actions/setup-python@v5
68+
with:
69+
python-version: ${{ env.PYTHON_VERSION }}
70+
check-latest: false
71+
- name: Install dependencies
72+
run: |
73+
sudo apt-get -qq update
74+
sudo apt-get install -y python3-setuptools libglew-dev libxrandr-dev libxcursor-dev libxinerama-dev libxi-dev
75+
pip install --upgrade pip
76+
pip install PySide2 PyOpenGL
77+
- name: Build USD
78+
run: |
79+
python3 build_scripts/build_usd.py --no-materialx --build USDgen/build --src USDgen/src USDinst -v
80+
- name: Save build artifacts to cache
81+
if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
82+
uses: actions/cache/save@v4
83+
with:
84+
path: |
85+
USDinst
86+
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
87+
- name: Upload artifacts
88+
uses: actions/upload-artifact@v4
89+
with:
90+
name: usd-linux
91+
path: USDinst
92+
93+
macOS:
94+
needs: [GetUser, GetGitRef]
95+
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
96+
runs-on: macos-13
97+
timeout-minutes: 120
98+
steps:
99+
- run: echo ${{ needs.GetUser.outputs.require-result }}
100+
- name: Checkout code
101+
uses: actions/checkout@v4
102+
with:
103+
ref: ${{needs.GetGitRef.outputs.ref}}
104+
- name: Restore cached artifacts
105+
id: cache-usd-build-dependency
106+
uses: actions/cache/restore@v4
107+
with:
108+
path: |
109+
USDinst
110+
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION_MAC }}-${{ hashFiles('build_scripts/**/*') }}
111+
- name: Install Python
112+
uses: actions/setup-python@v5
113+
with:
114+
python-version: ${{ env.PYTHON_VERSION_MAC }}
115+
check-latest: false
116+
- name: Install dependencies
117+
run: |
118+
export PATH=/Applications/CMake.app/Contents/bin:$PATH
119+
sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
120+
# Set SYSTEM_VERSION_COMPAT while installing Python packages to
121+
# accommodate the macOS version numbering change from 10.x to 11
122+
export SYSTEM_VERSION_COMPAT=1
123+
pip install PySide6 PyOpenGL setuptools
124+
export -n SYSTEM_VERSION_COMPAT
125+
- name: Build USD
126+
run: |
127+
export PATH=/Applications/CMake.app/Contents/bin:$PATH
128+
python3 build_scripts/build_usd.py --no-materialx --generator Xcode --build USDgen/build --src USDgen/src USDinst -v
129+
- name: Save build artifacts to cache
130+
if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
131+
uses: actions/cache/save@v4
132+
with:
133+
path: |
134+
USDinst
135+
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION_MAC }}-${{ hashFiles('build_scripts/**/*') }}
136+
- name: Upload artifacts
137+
uses: actions/upload-artifact@v4
138+
with:
139+
name: usd-macOS
140+
path: USDinst
141+
142+
Windows:
143+
needs: [GetUser, GetGitRef]
144+
if: ${{ (github.event.issue.pull_request && contains(github.event.comment.body, '/AzurePipelines run') && needs.GetUser.outputs.require-result == 'true' ) || github.event_name == 'push' }}
145+
runs-on: windows-2019
146+
timeout-minutes: 120
147+
steps:
148+
- run: echo ${{ needs.GetUser.outputs.require-result }}
149+
- name: Checkout code
150+
uses: actions/checkout@v4
151+
with:
152+
ref: ${{needs.GetGitRef.outputs.ref}}
153+
- name: Restore cached artifacts
154+
id: cache-usd-build-dependency
155+
uses: actions/cache/restore@v4
156+
with:
157+
path: |
158+
USDinst
159+
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
160+
- name: Install Python
161+
uses: actions/setup-python@v5
162+
with:
163+
python-version: ${{ env.PYTHON_VERSION }}
164+
check-latest: false
165+
- name: Install dependencies
166+
run: |
167+
python -m pip install --upgrade pip
168+
python -m pip install PyOpenGL PySide2
169+
- name: Build USD
170+
run: |
171+
REM Unset BOOST_ROOT on Windows. The VS2017-Win2016 image
172+
REM sets this env var to a pre-installed boost which causes
173+
REM the USD build to favor this over the boost built by
174+
REM build_usd.py. This causes the build to fail, because
175+
REM the pre-installed boost does not include boost_python27
176+
call set BOOST_ROOT=
177+
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
178+
shell: cmd
179+
- name: Save build artifacts to cache
180+
if: steps.cache-usd-build-dependency.outputs.cache-hit != 'true'
181+
uses: actions/cache/save@v4
182+
with:
183+
path: |
184+
USDinst
185+
key: ${{ runner.os }}-BuildUSD-py${{ env.PYTHON_VERSION }}-${{ hashFiles('build_scripts/**/*') }}
186+
- name: Upload artifacts
187+
# use v3 because actions/upload-artifact@v4 fails
188+
# see https://github.com/actions/upload-artifact/issues/485
189+
uses: actions/upload-artifact@v3
190+
with:
191+
name: usd-win64
192+
path: USDinst

0 commit comments

Comments
 (0)