Skip to content
Snippets Groups Projects
Commit 94990901 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-18837: Segregate ReleaseOS artifacts; don't even upload.

Eliminate references to (no longer set) matrix.addrsize.
parent b8e67774
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -86,10 +86,10 @@ jobs: ...@@ -86,10 +86,10 @@ jobs:
id: cache-installables id: cache-installables
with: with:
path: .autobuild-installables path: .autobuild-installables
key: ${{ runner.os }}-${{ matrix.addrsize }}-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }} key: ${{ runner.os }}-64-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ matrix.addrsize }}-${{ matrix.configuration }}- ${{ runner.os }}-64-${{ matrix.configuration }}-
${{ runner.os }}-${{ matrix.addrsize }}- ${{ runner.os }}-64-
- name: Install windows dependencies - name: Install windows dependencies
if: runner.os == 'Windows' if: runner.os == 'Windows'
...@@ -205,9 +205,14 @@ jobs: ...@@ -205,9 +205,14 @@ jobs:
# platform, we must disambiguate on more than the platform name. # platform, we must disambiguate on more than the platform name.
# e.g. if we were still running Windows 32-bit builds, we'd need to # e.g. if we were still running Windows 32-bit builds, we'd need to
# qualify the artifact with bit width. # qualify the artifact with bit width.
echo "artifact=$RUNNER_OS" >> $GITHUB_OUTPUT if [[ "$AUTOBUILD_CONFIGURATION" == "ReleaseOS" ]]
then cfg_suffix='OS'
else cfg_suffix=''
fi
echo "artifact=$RUNNER_OS$cfg_suffix" >> $GITHUB_OUTPUT
- name: Upload installer - name: Upload installer
if: matrix.configuration != "ReleaseOS"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "${{ steps.build.outputs.artifact }}-installer" name: "${{ steps.build.outputs.artifact }}-installer"
...@@ -216,7 +221,7 @@ jobs: ...@@ -216,7 +221,7 @@ jobs:
${{ steps.build.outputs.installer }} ${{ steps.build.outputs.installer }}
- name: Upload executable - name: Upload executable
if: steps.build.outputs.viewer_exe if: matrix.configuration != "ReleaseOS" && steps.build.outputs.viewer_exe
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "${{ steps.build.outputs.artifact }}-exe" name: "${{ steps.build.outputs.artifact }}-exe"
...@@ -225,6 +230,7 @@ jobs: ...@@ -225,6 +230,7 @@ jobs:
# The other upload of nontrivial size is the symbol file. Use a distinct # The other upload of nontrivial size is the symbol file. Use a distinct
# artifact for that too. # artifact for that too.
- name: Upload symbol file - name: Upload symbol file
if: matrix.configuration != "ReleaseOS"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: "${{ steps.build.outputs.artifact }}-symbols" name: "${{ steps.build.outputs.artifact }}-symbols"
...@@ -232,6 +238,7 @@ jobs: ...@@ -232,6 +238,7 @@ jobs:
${{ steps.build.outputs.symbolfile }} ${{ steps.build.outputs.symbolfile }}
- name: Upload metadata - name: Upload metadata
if: matrix.configuration != "ReleaseOS"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
# Call this artifact just "Windows" or "macOS" because it's the only # Call this artifact just "Windows" or "macOS" because it's the only
...@@ -248,7 +255,7 @@ jobs: ...@@ -248,7 +255,7 @@ jobs:
- name: Upload physics package - name: Upload physics package
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
# should only be set for viewer-private # should only be set for viewer-private
if: steps.build.outputs.physicstpv if: matrix.configuration != "ReleaseOS" && steps.build.outputs.physicstpv
with: with:
name: "${{ steps.build.outputs.artifact }}-physics" name: "${{ steps.build.outputs.artifact }}-physics"
# emitted by build.sh, zero or one lines # emitted by build.sh, zero or one lines
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment