Skip to content

Commit 0a8af1f

Browse files
brechtvlbrechtvl
committed
Merge branch 'dev' into fix-core-profile
2 parents 2e4b64d + e9d9715 commit 0a8af1f

File tree

7,340 files changed

+525139
-295876
lines changed

Some content is hidden

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

7,340 files changed

+525139
-295876
lines changed

‎.github/pull_request_template.md‎

Lines changed: 14 additions & 11 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-
-
56

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

0 commit comments

Comments
 (0)