Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/create-usd-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
cmakeVersion: "~3.26.0"

- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Check if artifact exists in 'USD-${{ github.event.inputs.usd_version }}-Artifacts' Release
id: check_artifact
Expand Down Expand Up @@ -108,14 +108,14 @@ jobs:
brew cleanup

- name: Install Additional Dependencies (Ubuntu)
if: env.exists == 'false' && contains(matrix.os, 'ubuntu')
if: env.exists == 'false' && runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y build-essential libgl1-mesa-dev libglew-dev libxi-dev libxrandr-dev
sudo apt-get install -y libx11-dev libxinerama-dev libxcursor-dev libxi-dev

- name: Install Additional Dependencies (Windows)
if: env.exists == 'false' && contains(matrix.os, 'windows')
if: env.exists == 'false' && runner.os == 'Windows'
run: |
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'

Expand Down Expand Up @@ -190,14 +190,14 @@ jobs:
Invoke-Expression $python_cmd

- name: Remove Specific Folders Unix
if: env.exists == 'false' && contains(matrix.os, 'windows') == 'false'
if: env.exists == 'false' && runner.os != 'Windows'
run: |
rm -rf ${{ github.workspace }}/usd_build/build
rm -rf ${{ github.workspace }}/usd_build/share
rm -rf ${{ github.workspace }}/usd_build/src

- name: Remove Specific Folders Windows
if: env.exists == 'false' && contains(matrix.os, 'windows')
if: env.exists == 'false' && runner.os == 'Windows'
run: |
powershell -Command "& {
Remove-Item -Path ${{ github.workspace }}\usd_build\build -Recurse -Force
Expand Down Expand Up @@ -229,13 +229,13 @@ jobs:
}

- name: Package Build Artifacts Unix
if: env.exists == 'false' && contains(matrix.os, 'windows') == 'false'
if: env.exists == 'false' && runner.os != 'Windows'
run: |
cd ${{ github.workspace }}/usd_build
zip -r ../usd-${{ github.event.inputs.usd_version }}-${{ matrix.os }}.zip *

- name: Package Build Artifacts Windows
if: env.exists == 'false' && contains(matrix.os, 'windows')
if: env.exists == 'false' && runner.os == 'Windows'
run: |
powershell -Command "& {
Set-Location ${{ github.workspace }}\usd_build
Expand Down
10 changes: 9 additions & 1 deletion test/full_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,35 @@
{ "os": "windows-2022", "usd_version": "2411" },
{ "os": "windows-2022", "usd_version": "2508" },
{ "os": "windows-2022", "usd_version": "2511" },
{ "os": "windows-2022", "usd_version": "2603" },

{ "os": "windows-2025", "usd_version": "2508" },
{ "os": "windows-2025", "usd_version": "2511" },
{ "os": "windows-2025", "usd_version": "2603" },

{ "os": "macOS-14", "usd_version": "2408" },
{ "os": "macOS-14", "usd_version": "2411" },
{ "os": "macOS-14", "usd_version": "2508" },
{ "os": "macOS-14", "usd_version": "2511" },
{ "os": "macOS-14", "usd_version": "2603" },

{ "os": "macOS-15", "usd_version": "2408" },
{ "os": "macOS-15", "usd_version": "2411" },
{ "os": "macOS-15", "usd_version": "2508" },
{ "os": "macOS-15", "usd_version": "2511" },
{ "os": "macOS-15", "usd_version": "2603" },

{ "os": "macos-26", "usd_version": "2508" },
{ "os": "macos-26", "usd_version": "2511" },
{ "os": "macos-26", "usd_version": "2603" },

{ "os": "ubuntu-22.04", "usd_version": "2308" },
{ "os": "ubuntu-22.04", "usd_version": "2311" },
{ "os": "ubuntu-22.04", "usd_version": "2405" },
{ "os": "ubuntu-22.04", "usd_version": "2408" },
{ "os": "ubuntu-22.04", "usd_version": "2411" }
{ "os": "ubuntu-22.04", "usd_version": "2411" },
{ "os": "ubuntu-22.04", "usd_version": "2508" },
{ "os": "ubuntu-22.04", "usd_version": "2511" },
{ "os": "ubuntu-22.04", "usd_version": "2603" }
]
}
14 changes: 7 additions & 7 deletions test/pr_versions.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"include": [
{ "os": "windows-2022", "usd_version": "2508" },
{ "os": "windows-2022", "usd_version": "2511" },
{ "os": "windows-2022", "usd_version": "2603" },

{ "os": "windows-2025", "usd_version": "2508" },
{ "os": "windows-2025", "usd_version": "2511" },
{ "os": "windows-2025", "usd_version": "2603" },

{ "os": "macOS-14", "usd_version": "2508" },
{ "os": "macOS-14", "usd_version": "2511" },
{ "os": "macOS-14", "usd_version": "2603" },

{ "os": "macOS-15", "usd_version": "2508" },
{ "os": "macOS-15", "usd_version": "2511" },
{ "os": "macOS-15", "usd_version": "2603" },

{ "os": "macos-26", "usd_version": "2508" },
{ "os": "macos-26", "usd_version": "2511" },
{ "os": "macos-26", "usd_version": "2603" },

{ "os": "ubuntu-22.04", "usd_version": "2508" },
{ "os": "ubuntu-22.04", "usd_version": "2511" }
{ "os": "ubuntu-22.04", "usd_version": "2511" },
{ "os": "ubuntu-22.04", "usd_version": "2603" }
]
}
Loading