From becd5ca7b79e566a634a96c7a48d0b9c9e38a1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Delgado=20Kr=C3=A4mer?= Date: Sun, 9 Feb 2025 15:14:59 +0100 Subject: [PATCH] GA: upgrade actions/upload-artifact from v3 to v4 --- .github/workflows/build-usd.yml | 17 +++++++---------- .github/workflows/build.yml | 9 +++------ .github/workflows/deploy-release.yml | 26 +++----------------------- .github/workflows/run-tests.yml | 15 ++++++++------- 4 files changed, 21 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build-usd.yml b/.github/workflows/build-usd.yml index 22ca890..e4d7622 100644 --- a/.github/workflows/build-usd.yml +++ b/.github/workflows/build-usd.yml @@ -16,11 +16,9 @@ on: required: false type: boolean default: true - - outputs: - archive-name: - description: "Name of the archive containing the build artifacts." - value: build-${{ inputs.build-config }}-${{ github.sha }} + archive-name-suffix: + required: false + type: string jobs: build: @@ -33,19 +31,19 @@ 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 - archive-file-name: guc_USD${{ inputs.usd-version }}_Linux_x64.tar.gz + archive-name: guc_USD${{ inputs.usd-version }}_Linux_x64 - 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 + archive-name: guc_USD${{ inputs.usd-version }}_MacOS_ARM - os-family: Windows 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 - archive-file-name: guc_USD${{ inputs.usd-version }}_Windows_x64.tar.gz + archive-name: guc_USD${{ inputs.usd-version }}_Windows_x64 uses: ./.github/workflows/build.yml with: @@ -54,6 +52,5 @@ jobs: usd-download-url: ${{ matrix.usd-download-url }} usd-install-path: ${{ matrix.usd-install-path }} upload-archive: ${{ inputs.upload-archive }} - archive-name: build-${{ inputs.build-config }}-${{ github.sha }} - archive-file-name: ${{ matrix.archive-file-name }} + archive-name: ${{ matrix.archive-name }}${{ inputs.archive-name-suffix }} extra-cmake-flags: ${{ inputs.extra-cmake-flags }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a723210..ec0c5b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,9 +22,6 @@ on: archive-name: required: true type: string - archive-file-name: - required: true - type: string extra-cmake-flags: required: false type: string @@ -71,12 +68,12 @@ jobs: - name: Create archive if: ${{ inputs.upload-archive }} working-directory: INSTALL - run: tar -zcvf ${{ inputs.archive-file-name }} * + run: tar -zcvf ${{ inputs.archive-name }}.tar.gz * - name: Upload archive if: ${{ inputs.upload-archive }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ inputs.archive-name }} - path: INSTALL/${{ inputs.archive-file-name }} + path: INSTALL/${{ inputs.archive-name }}.tar.gz retention-days: 1 diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 95758f0..06f1c6d 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -60,30 +60,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Download USD v25.02 artifacts - uses: actions/download-artifact@v3 + - name: Download artifacts + uses: actions/download-artifact@v4 with: - name: ${{ needs.build-2502.outputs.archive-name }} - - - name: Download USD v24.11 artifacts - uses: actions/download-artifact@v3 - with: - name: ${{ needs.build-2411.outputs.archive-name }} - - - name: Download USD v24.08 artifacts - uses: actions/download-artifact@v3 - with: - name: ${{ needs.build-2408.outputs.archive-name }} - - - 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: - name: ${{ needs.build-2403.outputs.archive-name }} + merge-multiple: true - name: Deploy draft release uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7909857..8392ef2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -36,6 +36,7 @@ jobs: usd-version: ${{ inputs.usd-version }} build-config: Debug extra-cmake-flags: -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=1 + archive-name-suffix: _debug build-debug-oiio: name: Build guc for USD v${{ inputs.usd-version }} (Debug, OpenImageIO) @@ -84,12 +85,12 @@ jobs: - name: Download guc artifacts id: download-guc - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: ${{ needs.build-release.outputs.archive-name }} + merge-multiple: true - name: Install guc - run: mkdir -p GUC_INSTALL && tar -xvf ${{ matrix.artifact-name}} -C $PWD/GUC_INSTALL + run: mkdir -p GUC_INSTALL && tar -xvf ${{ matrix.artifact-name }} -C $PWD/GUC_INSTALL - name: Set up environment variables (Linux) if: matrix.os-family == 'Linux' @@ -128,7 +129,7 @@ jobs: env: 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 + GUC_ARTIFACT_NAME: guc_USD${{ inputs.usd-version }}_Linux_x64_debug.tar.gz USD_INSTALL_PATH: /home/runner/work/USD/USD/INSTALL steps: @@ -140,9 +141,9 @@ jobs: - name: Download guc artifacts id: download-guc - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: ${{ needs.build-debug.outputs.archive-name }} + merge-multiple: true # Install guc to the USD installation so that we can use the usdGlTF Sdf plugin - name: Install guc @@ -216,7 +217,7 @@ jobs: - name: Upload archive if: success() || failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: test-output.tar.gz if-no-files-found: error