GA: update to USD v24.03

pablode · Mar 7, 2024 · 34d7bd9 · 34d7bd9
1 parent 8715cb5
commit 34d7bd9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 23 deletions.
diff --git a/.github/workflows/build-usd23.08.yml → .github/workflows/build-usd24.03.yml b/.github/workflows/build-usd23.08.yml → .github/workflows/build-usd24.03.yml
@@ -1,4 +1,4 @@
-name: Build guc for USD v23.08
+name: Build guc for USD v24.03
 
 on:
   workflow_call:
@@ -24,21 +24,21 @@ jobs:
         include:
         - os-family: Linux
           image: ubuntu-20.04
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v23.08-ci-release/USD23.08_Linux_x64_Python3.8.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_Linux_x64_Python3.9.tar.gz"
           usd-install-path: /home/runner/work/USD/USD/INSTALL
-          archive-file-name: guc_USD23.08_Linux_x64_Python3.8.tar.gz
+          archive-file-name: guc_USD24.03_Linux_x64_Python3.9.tar.gz
 
         - os-family: MacOS
           image: macos-12
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v23.08-ci-release/USD23.08_MacOS_x64_Python3.7.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_MacOS_x64_Python3.9.tar.gz"
           usd-install-path: /Users/runner/work/USD/USD/INSTALL
-          archive-file-name: guc_USD23.08_MacOS_x64_Python3.7.tar.gz
+          archive-file-name: guc_USD24.03_MacOS_x64_Python3.9.tar.gz
 
         - os-family: Windows
           image: windows-2019
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v23.08-ci-release/USD23.08_Windows_x64_Python3.7.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_Windows_x64_Python3.9.tar.gz"
           usd-install-path: C:/INSTALL
-          archive-file-name: guc_USD23.08_Windows_x64_Python3.7.tar.gz
+          archive-file-name: guc_USD24.03_Windows_x64_Python3.9.tar.gz
 
     uses: ./.github/workflows/build.yml
     with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,10 +40,16 @@ jobs:
       if: runner.os == 'macOS'
       run: |
         brew install pyenv
-        env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install 3.7.13
-        pyenv global 3.7.13
+        env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install 3.9.13
+        pyenv global 3.9.13
         echo "$HOME/.pyenv/shims" >> $GITHUB_PATH
 
+    - name: Set up Python (Linux & Windows)
+      if: matrix.name != 'MacOS'
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.9'
+
     - name: Check out repository
       uses: actions/checkout@v3
       with:

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -35,15 +35,15 @@ defaults:
 
 jobs:
   build-debug:
-    name: Build guc for USD v23.08 (Debug)
-    uses: ./.github/workflows/build-usd23.08.yml
+    name: Build guc for USD v24.03 (Debug)
+    uses: ./.github/workflows/build-usd24.03.yml
     with:
       build-config: Debug
       extra-cmake-flags: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
 
   build-release:
-    name: Build guc for USD v23.08 (Release)
-    uses: ./.github/workflows/build-usd23.08.yml
+    name: Build guc for USD v24.03 (Release)
+    uses: ./.github/workflows/build-usd24.03.yml
     with:
       build-config: Release
       extra-cmake-flags: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
@@ -59,14 +59,14 @@ jobs:
         include:
         - os-family: Linux
           image: ubuntu-20.04
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v23.08-ci-release/USD23.08_Linux_x64_Python3.8.tar.gz"
-          artifact-name: guc_USD23.08_Linux_x64_Python3.8.tar.gz
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_Linux_x64_Python3.9.tar.gz"
+          artifact-name: guc_USD24.03_Linux_x64_Python3.9.tar.gz
           executable-name: guc
 
         - os-family: Windows
           image: windows-2019
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v23.08-ci-release/USD23.08_Windows_x64_Python3.7.tar.gz"
-          artifact-name: guc_USD23.08_Windows_x64_Python3.7.tar.gz
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_Windows_x64_Python3.9.tar.gz"
+          artifact-name: guc_USD24.03_Windows_x64_Python3.9.tar.gz
           executable-name: guc.exe
 
     steps:
@@ -96,6 +96,11 @@ jobs:
         echo "$(pwd -W)/USD_INSTALL/lib" >> $GITHUB_PATH
         echo "$(pwd -W)/USD_INSTALL/bin" >> $GITHUB_PATH
 
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.9'
+
     - name: Fetch example glTF file
       run: mkdir test && curl "https://github.com/KhronosGroup/glTF-Sample-Models/raw/db9ff67c1116cfe28eb36320916bccd8c4127cc1/2.0/ToyCar/glTF-Binary/ToyCar.glb" -L -v -o test/asset.glb
 
@@ -116,8 +121,8 @@ jobs:
     needs: build-debug
 
     env:
-      USD_DOWNLOAD_URL: "https://github.com/pablode/USD/releases/download/v23.08-ci-release/USD23.08_Linux_x64_Python3.8.tar.gz"
-      GUC_ARTIFACT_NAME: guc_USD23.08_Linux_x64_Python3.8.tar.gz
+      USD_DOWNLOAD_URL: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_Linux_x64_Python3.9.tar.gz"
+      GUC_ARTIFACT_NAME: guc_USD24.03_Linux_x64_Python3.9.tar.gz
       USD_INSTALL_PATH: /home/runner/work/USD/USD/INSTALL
 
     steps:
@@ -145,10 +150,6 @@ jobs:
         sudo apt upgrade
         sudo apt-get install mesa-utils xvfb qt5-default
 
-      # usdrecord needs python (may change soon!)
-    - name: Install Python packages
-      run: pip3 install --user PySide2 PyOpenGL
-
     - name: Set up environment variables
       run: |
         # Test options
@@ -173,6 +174,15 @@ jobs:
         # guc debug output
         echo "TF_DEBUG=GUC" >> $GITHUB_ENV
 
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.9'
+
+      # usdrecord needs python (may change soon!)
+    - name: Install Python packages
+      run: pip3 install --user PySide2 PyOpenGL
+
     - name: Start virtual framebuffer
       run: |
         Xvfb :1 -screen 0 1280x960x24 &