mirror of
https://github.com/lighttransport/tinyusdz.git
synced 2026-01-18 01:11:17 +01:00
Merge pull request #266 from lighttransport/fix-openusd-windows-filename
Fix Windows OpenUSD binary filename pattern in CI
This commit is contained in:
40
.github/workflows/linux_ci.yml
vendored
40
.github/workflows/linux_ci.yml
vendored
@@ -132,20 +132,18 @@ jobs:
|
|||||||
|
|
||||||
- name: Extract and setup OpenUSD
|
- name: Extract and setup OpenUSD
|
||||||
run: |
|
run: |
|
||||||
tar -xzf openusd-*-minsizerel-linux-x86_64.tar.gz
|
mkdir -p openusd
|
||||||
USD_DIR=$(find . -maxdepth 1 -type d -name "openusd-*" | head -n 1)
|
tar -xzf openusd-*-minsizerel-linux-x86_64.tar.gz -C openusd
|
||||||
echo "USD_DIR=$USD_DIR" >> $GITHUB_ENV
|
USD_ROOT="$(pwd)/openusd"
|
||||||
echo "USD_INSTALL_ROOT=$(pwd)/$USD_DIR" >> $GITHUB_ENV
|
echo "USD_INSTALL_ROOT=$USD_ROOT" >> $GITHUB_ENV
|
||||||
echo "$(pwd)/$USD_DIR/bin" >> $GITHUB_PATH
|
echo "$USD_ROOT/bin" >> $GITHUB_PATH
|
||||||
echo "LD_LIBRARY_PATH=$(pwd)/$USD_DIR/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
|
echo "LD_LIBRARY_PATH=$USD_ROOT/lib:$USD_ROOT/tbb/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
|
||||||
if [ -f "setup-usd-env.sh" ]; then
|
echo "PYTHONPATH=$USD_ROOT/lib/python:$PYTHONPATH" >> $GITHUB_ENV
|
||||||
source setup-usd-env.sh
|
echo "PXR_PLUGINPATH_NAME=$USD_ROOT/lib/usd" >> $GITHUB_ENV
|
||||||
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Verify OpenUSD installation
|
- name: Verify OpenUSD installation
|
||||||
run: |
|
run: |
|
||||||
usdcat --version || usdcat --help
|
usdcat --help
|
||||||
echo "OpenUSD binary: $(which usdcat)"
|
echo "OpenUSD binary: $(which usdcat)"
|
||||||
|
|
||||||
- name: Test TinyUSDZ and OpenUSD interoperability
|
- name: Test TinyUSDZ and OpenUSD interoperability
|
||||||
@@ -299,20 +297,18 @@ jobs:
|
|||||||
|
|
||||||
- name: Extract and setup OpenUSD (ARM64)
|
- name: Extract and setup OpenUSD (ARM64)
|
||||||
run: |
|
run: |
|
||||||
tar -xzf openusd-*-minsizerel-linux-arm64.tar.gz
|
mkdir -p openusd
|
||||||
USD_DIR=$(find . -maxdepth 1 -type d -name "openusd-*" | head -n 1)
|
tar -xzf openusd-*-minsizerel-linux-arm64.tar.gz -C openusd
|
||||||
echo "USD_DIR=$USD_DIR" >> $GITHUB_ENV
|
USD_ROOT="$(pwd)/openusd"
|
||||||
echo "USD_INSTALL_ROOT=$(pwd)/$USD_DIR" >> $GITHUB_ENV
|
echo "USD_INSTALL_ROOT=$USD_ROOT" >> $GITHUB_ENV
|
||||||
echo "$(pwd)/$USD_DIR/bin" >> $GITHUB_PATH
|
echo "$USD_ROOT/bin" >> $GITHUB_PATH
|
||||||
echo "LD_LIBRARY_PATH=$(pwd)/$USD_DIR/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
|
echo "LD_LIBRARY_PATH=$USD_ROOT/lib:$USD_ROOT/tbb/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
|
||||||
if [ -f "setup-usd-env.sh" ]; then
|
echo "PYTHONPATH=$USD_ROOT/lib/python:$PYTHONPATH" >> $GITHUB_ENV
|
||||||
source setup-usd-env.sh
|
echo "PXR_PLUGINPATH_NAME=$USD_ROOT/lib/usd" >> $GITHUB_ENV
|
||||||
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Verify OpenUSD installation (ARM64)
|
- name: Verify OpenUSD installation (ARM64)
|
||||||
run: |
|
run: |
|
||||||
usdcat --version || usdcat --help
|
usdcat --help
|
||||||
echo "OpenUSD binary: $(which usdcat)"
|
echo "OpenUSD binary: $(which usdcat)"
|
||||||
|
|
||||||
- name: Test TinyUSDZ and OpenUSD interoperability (ARM64)
|
- name: Test TinyUSDZ and OpenUSD interoperability (ARM64)
|
||||||
|
|||||||
20
.github/workflows/macos_ci.yml
vendored
20
.github/workflows/macos_ci.yml
vendored
@@ -39,20 +39,18 @@ jobs:
|
|||||||
|
|
||||||
- name: Extract and setup OpenUSD (macOS ARM64)
|
- name: Extract and setup OpenUSD (macOS ARM64)
|
||||||
run: |
|
run: |
|
||||||
tar -xzf openusd-*-minsizerel-macos-arm64.tar.gz
|
mkdir -p openusd
|
||||||
USD_DIR=$(find . -maxdepth 1 -type d -name "openusd-*" | head -n 1)
|
tar -xzf openusd-*-minsizerel-macos-arm64.tar.gz -C openusd
|
||||||
echo "USD_DIR=$USD_DIR" >> $GITHUB_ENV
|
USD_ROOT="$(pwd)/openusd"
|
||||||
echo "USD_INSTALL_ROOT=$(pwd)/$USD_DIR" >> $GITHUB_ENV
|
echo "USD_INSTALL_ROOT=$USD_ROOT" >> $GITHUB_ENV
|
||||||
echo "$(pwd)/$USD_DIR/bin" >> $GITHUB_PATH
|
echo "$USD_ROOT/bin" >> $GITHUB_PATH
|
||||||
echo "DYLD_LIBRARY_PATH=$(pwd)/$USD_DIR/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
|
echo "DYLD_LIBRARY_PATH=$USD_ROOT/lib:$USD_ROOT/tbb/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
|
||||||
if [ -f "setup-usd-env.sh" ]; then
|
echo "PYTHONPATH=$USD_ROOT/lib/python:$PYTHONPATH" >> $GITHUB_ENV
|
||||||
source setup-usd-env.sh
|
echo "PXR_PLUGINPATH_NAME=$USD_ROOT/lib/usd" >> $GITHUB_ENV
|
||||||
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Verify OpenUSD installation (macOS ARM64)
|
- name: Verify OpenUSD installation (macOS ARM64)
|
||||||
run: |
|
run: |
|
||||||
usdcat --version || usdcat --help
|
usdcat --help
|
||||||
echo "OpenUSD binary: $(which usdcat)"
|
echo "OpenUSD binary: $(which usdcat)"
|
||||||
|
|
||||||
- name: Test TinyUSDZ and OpenUSD interoperability (macOS ARM64)
|
- name: Test TinyUSDZ and OpenUSD interoperability (macOS ARM64)
|
||||||
|
|||||||
19
.github/workflows/windows_ci.yml
vendored
19
.github/workflows/windows_ci.yml
vendored
@@ -40,21 +40,26 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
gh release download v25.11-lte `
|
gh release download v25.11-lte `
|
||||||
--repo lighttransport/openusd-bin `
|
--repo lighttransport/openusd-bin `
|
||||||
--pattern 'openusd-*-minsizerel-win64.zip'
|
--pattern 'openusd-*-minsizerel-windows-x86_64.zip'
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
|
||||||
- name: Extract and setup OpenUSD (Windows x64)
|
- name: Extract and setup OpenUSD (Windows x64)
|
||||||
run: |
|
run: |
|
||||||
$archive = Get-ChildItem -Filter "openusd-*-minsizerel-win64.zip" | Select-Object -First 1
|
$archive = Get-ChildItem -Filter "openusd-*-minsizerel-windows-x86_64.zip" | Select-Object -First 1
|
||||||
Expand-Archive -Path $archive.FullName -DestinationPath . -Force
|
New-Item -ItemType Directory -Name openusd -Force | Out-Null
|
||||||
$usdDir = Get-ChildItem -Directory -Filter "openusd-*" | Select-Object -First 1
|
Expand-Archive -Path $archive.FullName -DestinationPath openusd -Force
|
||||||
echo "USD_INSTALL_ROOT=$($usdDir.FullName)" >> $env:GITHUB_ENV
|
$usdRoot = Resolve-Path openusd
|
||||||
echo "$($usdDir.FullName)\bin" >> $env:GITHUB_PATH
|
echo "USD_INSTALL_ROOT=$usdRoot" >> $env:GITHUB_ENV
|
||||||
|
echo "$usdRoot\bin" >> $env:GITHUB_PATH
|
||||||
|
echo "$usdRoot\lib" >> $env:GITHUB_PATH
|
||||||
|
echo "$usdRoot\tbb\bin" >> $env:GITHUB_PATH
|
||||||
|
echo "PYTHONPATH=$usdRoot\lib\python;$env:PYTHONPATH" >> $env:GITHUB_ENV
|
||||||
|
echo "PXR_PLUGINPATH_NAME=$usdRoot\lib\usd" >> $env:GITHUB_ENV
|
||||||
|
|
||||||
- name: Verify OpenUSD installation (Windows x64)
|
- name: Verify OpenUSD installation (Windows x64)
|
||||||
run: |
|
run: |
|
||||||
usdcat --version
|
usdcat --help
|
||||||
Write-Host "OpenUSD binary location: $(Get-Command usdcat | Select-Object -ExpandProperty Source)"
|
Write-Host "OpenUSD binary location: $(Get-Command usdcat | Select-Object -ExpandProperty Source)"
|
||||||
|
|
||||||
- name: Test TinyUSDZ and OpenUSD interoperability (Windows x64)
|
- name: Test TinyUSDZ and OpenUSD interoperability (Windows x64)
|
||||||
|
|||||||
Reference in New Issue
Block a user