Skip to content

Commit

Permalink
WIP: rename
Browse files Browse the repository at this point in the history
  • Loading branch information
pablode committed Dec 1, 2024
1 parent 58b4c51 commit 28e9fd8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-houdini20.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
build-config: Release
usd-download-url: ${{ matrix.usd-download-url }}
usd-install-path: ${{ matrix.usd-install-path }}
upload-archive: true
upload-install-artifacts: true
archive-name: build-Release-${{ github.sha }}
archive-file-name: ${{ matrix.archive-file-name }}
mdl-sdk-cache-key: ${{ inputs.mdl-sdk-cache-key-prefix }}_${{ matrix.image }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-usd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
required: false
type: string
default: "MDL-SDK"
upload-archives:
upload-install-artifacts:
description: "Whether build results should be uploaded or not"
required: false
type: boolean
Expand All @@ -46,7 +46,7 @@ jobs:
image: ubuntu-20.04
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"
upload-archive: ${{ inputs.upload-archives }}
upload-install-artifacts: ${{ inputs.upload-install-artifacts }}
archive-file-name: "gatling_USD${{ inputs.usd-version }}_Linux_x64.tar.gz"
cmake-params:
run-graphical-tests: ${{ inputs.run-graphical-tests }}
Expand All @@ -56,15 +56,15 @@ jobs:
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"
# Don't upload clang build results -- we already have GCC's
upload-archive: false
upload-install-artifacts: false
cmake-params: -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
run-graphical-tests: false

- name: Windows / MSVC
image: windows-2019
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"
upload-archive: ${{ inputs.upload-archives }}
upload-install-artifacts: ${{ inputs.upload-install-artifacts }}
archive-file-name: "gatling_USD${{ inputs.usd-version }}_Windows_x64.tar.gz"
cmake-params: -G"Visual Studio 16 2019" -Ax64
run-graphical-tests: false
Expand All @@ -75,7 +75,7 @@ jobs:
build-config: ${{ inputs.build-config }}
usd-download-url: ${{ matrix.usd-download-url }}
usd-install-path: ${{ matrix.usd-install-path }}
upload-archive: ${{ matrix.upload-archive }}
upload-install-artifacts: ${{ matrix.upload-install-artifacts }}
archive-name: build-${{ inputs.build-config }}-${{ github.sha }}
archive-file-name: ${{ matrix.archive-file-name }}
mdl-sdk-cache-key: ${{ inputs.mdl-sdk-cache-key-prefix }}_${{ matrix.image }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
usd-install-path:
required: true
type: string
upload-archive:
upload-install-artifacts:
required: false
type: boolean
default: false
Expand Down Expand Up @@ -188,12 +188,12 @@ jobs:
retention-days: 7

- name: Create archive
if: inputs.upload-archive
if: inputs.upload-install-artifacts
working-directory: INSTALL
run: tar -zcvf ${{ inputs.archive-file-name }} *

- name: Upload archive
if: inputs.upload-archive
if: inputs.upload-install-artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.archive-name }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
usd-version: 24.11
mdl-sdk-cache-key-prefix: ${{ vars.MDL_SDK_CACHE_KEY_PREFIX }}
upload-archives: true
upload-install-artifacts: true
run-graphical-tests: true

build-usd2408:
Expand All @@ -27,7 +27,7 @@ jobs:
with:
usd-version: 24.08
mdl-sdk-cache-key-prefix: ${{ vars.MDL_SDK_CACHE_KEY_PREFIX }}
upload-archives: true
upload-install-artifacts: true
run-graphical-tests: true

build-usd2405:
Expand All @@ -37,7 +37,7 @@ jobs:
with:
usd-version: 24.05
mdl-sdk-cache-key-prefix: ${{ vars.MDL_SDK_CACHE_KEY_PREFIX }}
upload-archives: true
upload-install-artifacts: true

build-usd2403:
name: Build gatling for USD v24.03
Expand All @@ -46,7 +46,7 @@ jobs:
with:
usd-version: 24.03
mdl-sdk-cache-key-prefix: ${{ vars.MDL_SDK_CACHE_KEY_PREFIX }}
upload-archives: true
upload-install-artifacts: true

build-houdini20:
name: Build gatling for Houdini 20.0
Expand Down

0 comments on commit 28e9fd8

Please sign in to comment.