GA: update URLs, add USD v24.05 and macOS ARM

pablode · May 5, 2024 · 4b41cbb · 4b41cbb
1 parent 6b13e02
commit 4b41cbb
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/.github/workflows/build-usd.yml b/.github/workflows/build-usd.yml
@@ -31,19 +31,25 @@ jobs:
         include:
         - os-family: Linux
           image: ubuntu-20.04
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release2/USD${{ inputs.usd-version }}_Linux_x64.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_Linux_x64.tar.gz"
           usd-install-path: /home/runner/work/USD/USD/INSTALL
           archive-file-name: guc_USD${{ inputs.usd-version }}_Linux_x64.tar.gz
 
         - os-family: MacOS
           image: macos-12
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release2/USD${{ inputs.usd-version }}_MacOS_x64.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_MacOS_x64.tar.gz"
           usd-install-path: /Users/runner/work/USD/USD/INSTALL
           archive-file-name: guc_USD${{ inputs.usd-version }}_MacOS_x64.tar.gz
 
+        - os-family: MacOS
+          image: macos-14
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_MacOS_ARM.tar.gz"
+          usd-install-path: /Users/runner/work/USD/USD/INSTALL
+          archive-file-name: guc_USD${{ inputs.usd-version }}_MacOS_ARM.tar.gz
+
         - os-family: Windows
           image: windows-2019
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release2/USD${{ inputs.usd-version }}_Windows_x64.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_Windows_x64.tar.gz"
           usd-install-path: C:/INSTALL
           archive-file-name: guc_USD${{ inputs.usd-version }}_Windows_x64.tar.gz
 

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -12,6 +12,13 @@ on:
         default: 'TBD'
 
 jobs:
+  build-2405:
+    name: Build guc for USD v24.05
+    uses: ./.github/workflows/build-usd.yml
+    with:
+      usd-version: 24.05
+      build-config: Release
+
   build-2403:
     name: Build guc for USD v24.03
     uses: ./.github/workflows/build-usd.yml
@@ -28,10 +35,15 @@ jobs:
 
   deploy-release:
     name: Deploy Release
-    needs: [build-2403, build-2311]
+    needs: [build-2405, build-2403, build-2311]
     runs-on: ubuntu-latest
 
     steps:
+      - name: Download USD v24.05 artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ needs.build-2405.outputs.archive-name }}
+
       - name: Download USD v24.03 artifacts
         uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/run-tests-usd2405.yml b/.github/workflows/run-tests-usd2405.yml
@@ -0,0 +1,16 @@
+name: USD v24.05
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  run-tests:
+    name: Run Tests for USD v24.05
+    uses: ./.github/workflows/run-tests.yml
+    with:
+      usd-version: 24.05
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -65,13 +65,13 @@ jobs:
         include:
         - os-family: Linux
           image: ubuntu-20.04
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release2/USD${{ inputs.usd-version }}_Linux_x64_Python3.9.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_Linux_x64_Python3.9.tar.gz"
           artifact-name: guc_USD${{ inputs.usd-version }}_Linux_x64.tar.gz
           executable-name: guc
 
         - os-family: Windows
           image: windows-2019
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release2/USD${{ inputs.usd-version }}_Windows_x64_Python3.9.tar.gz"
+          usd-download-url: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_Windows_x64_Python3.9.tar.gz"
           artifact-name: guc_USD${{ inputs.usd-version }}_Windows_x64.tar.gz
           executable-name: guc.exe
 
@@ -127,7 +127,7 @@ jobs:
     needs: build-debug
 
     env:
-      USD_DOWNLOAD_URL: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release2/USD${{ inputs.usd-version }}_Linux_x64_Python3.9.tar.gz"
+      USD_DOWNLOAD_URL: "https://github.com/pablode/USD/releases/download/v${{ inputs.usd-version }}-ci-release/USD${{ inputs.usd-version }}_Linux_x64_Python3.9.tar.gz"
       GUC_ARTIFACT_NAME: guc_USD${{ inputs.usd-version }}_Linux_x64.tar.gz
       USD_INSTALL_PATH: /home/runner/work/USD/USD/INSTALL