GA: refactor workflows to accomodate multiple USD versions

pablode · Mar 9, 2024 · 28b944f · 28b944f
1 parent b422d84
commit 28b944f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/build-usd24.03.yml → .github/workflows/build-usd.yml b/.github/workflows/build-usd24.03.yml → .github/workflows/build-usd.yml
@@ -1,8 +1,11 @@
-name: Build guc for USD v24.03
+name: Build guc for USD v${{ inputs.usd-version }}
 
 on:
   workflow_call:
     inputs:
+      usd-version:
+        required: true
+        type: string
       build-config:
         required: true
         type: string
@@ -24,21 +27,21 @@ jobs:
         include:
         - os-family: Linux
           image: ubuntu-20.04
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_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"
           usd-install-path: /home/runner/work/USD/USD/INSTALL
-          archive-file-name: guc_USD24.03_Linux_x64_Python3.9.tar.gz
+          archive-file-name: guc_USD{{ inputs.usd-version }}_Linux_x64_Python3.9.tar.gz
 
         - os-family: MacOS
           image: macos-12
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_MacOS_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 }}_MacOS_x64_Python3.9.tar.gz"
           usd-install-path: /Users/runner/work/USD/USD/INSTALL
-          archive-file-name: guc_USD24.03_MacOS_x64_Python3.9.tar.gz
+          archive-file-name: guc_USD{{ inputs.usd-version }}_MacOS_x64_Python3.9.tar.gz
 
         - os-family: Windows
           image: windows-2019
-          usd-download-url: "https://github.com/pablode/USD/releases/download/v24.03-ci-release/USD24.03_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"
           usd-install-path: C:/INSTALL
-          archive-file-name: guc_USD24.03_Windows_x64_Python3.9.tar.gz
+          archive-file-name: guc_USD{{ inputs.usd-version }}_Windows_x64_Python3.9.tar.gz
 
     uses: ./.github/workflows/build.yml
     with:

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -10,9 +10,10 @@ on:
 
 jobs:
   build:
-    name: Build guc for USD v23.08
-    uses: ./.github/workflows/build-usd23.08.yml
+    name: Build guc for USD v24.03
+    uses: ./.github/workflows/build-usd.yml
     with:
+      usd-version: 24.03
       build-config: Release
 
   deploy-release:

diff --git a/.github/workflows/run-tests-usd24.03.yml b/.github/workflows/run-tests-usd24.03.yml
@@ -36,15 +36,17 @@ defaults:
 jobs:
   build-debug:
     name: Build guc for USD v24.03 (Debug)
-    uses: ./.github/workflows/build-usd24.03.yml
+    uses: ./.github/workflows/build-usd.yml
     with:
+      usd-version: 24.03
       build-config: Debug
       extra-cmake-flags: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
 
   build-release:
     name: Build guc for USD v24.03 (Release)
-    uses: ./.github/workflows/build-usd24.03.yml
+    uses: ./.github/workflows/build-usd.yml
     with:
+      usd-version: 24.03
       build-config: Release
       extra-cmake-flags: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON