diff --git a/.github/workflows/build-usd.yml b/.github/workflows/build-usd.yml index 5631c120..39e5a6e7 100644 --- a/.github/workflows/build-usd.yml +++ b/.github/workflows/build-usd.yml @@ -47,7 +47,7 @@ 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" upload-install-artifacts: ${{ inputs.upload-install-artifacts }} - archive-file-name: "gatling_USD${{ inputs.usd-version }}_Linux_x64.tar.gz" + archive-name: gatling_USD${{ inputs.usd-version }}_Linux_x64 cmake-params: run-graphical-tests: ${{ inputs.run-graphical-tests }} executable-suffix: @@ -67,7 +67,7 @@ jobs: 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-install-artifacts: ${{ inputs.upload-install-artifacts }} - archive-file-name: "gatling_USD${{ inputs.usd-version }}_Windows_x64.tar.gz" + archive-file-name: gatling_USD${{ inputs.usd-version }}_Windows_x64 cmake-params: -G"Visual Studio 16 2019" -Ax64 run-graphical-tests: false executable-suffix: '.exe' @@ -79,8 +79,7 @@ jobs: usd-download-url: ${{ matrix.usd-download-url }} usd-install-path: ${{ matrix.usd-install-path }} upload-install-artifacts: ${{ matrix.upload-install-artifacts }} - archive-name: build-${{ inputs.build-config }}-${{ github.sha }} - archive-file-name: ${{ matrix.archive-file-name }} + archive-name: ${{ matrix.archive-file-name }} mdl-sdk-cache-key: ${{ inputs.mdl-sdk-cache-key-prefix }}_${{ matrix.image }} cmake-params: ${{ matrix.cmake-params }} run-graphical-tests: ${{ matrix.run-graphical-tests }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37f15792..ebe4e06f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,6 @@ on: archive-name: required: true type: string - archive-file-name: - required: false - type: string mdl-sdk-cache-key: required: true type: string @@ -186,13 +183,12 @@ jobs: - name: Create install artifacts if: inputs.upload-install-artifacts working-directory: INSTALL - run: tar -zcvf ${{ inputs.archive-file-name }} * + run: tar -zcvf ${{ inputs.archive-name }}.tar.gz * - name: Upload archive if: inputs.upload-install-artifacts uses: actions/upload-artifact@v4 with: name: ${{ inputs.archive-name }}-${{ runner.os }} - path: INSTALL/${{ inputs.archive-file-name }} - merge-multiple: true + path: INSTALL/${{ inputs.archive-name }}.tar.gz retention-days: 7