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

Eliminate references to (no longer set) matrix.addrsize.
master
Nat Goodspeed 2023-09-07 11:38:00 -04:00
parent b8e6777439
commit 949909013e
1 changed files with 13 additions and 6 deletions

View File

@ -86,10 +86,10 @@ jobs:
id: cache-installables
with:
path: .autobuild-installables
key: ${{ runner.os }}-${{ matrix.addrsize }}-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }}
key: ${{ runner.os }}-64-${{ matrix.configuration }}-${{ hashFiles('autobuild.xml') }}
restore-keys: |
${{ runner.os }}-${{ matrix.addrsize }}-${{ matrix.configuration }}-
${{ runner.os }}-${{ matrix.addrsize }}-
${{ runner.os }}-64-${{ matrix.configuration }}-
${{ runner.os }}-64-
- name: Install windows dependencies
if: runner.os == 'Windows'
@ -205,9 +205,14 @@ jobs:
# 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
# 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
if: matrix.configuration != "ReleaseOS"
uses: actions/upload-artifact@v3
with:
name: "${{ steps.build.outputs.artifact }}-installer"
@ -216,7 +221,7 @@ jobs:
${{ steps.build.outputs.installer }}
- name: Upload executable
if: steps.build.outputs.viewer_exe
if: matrix.configuration != "ReleaseOS" && steps.build.outputs.viewer_exe
uses: actions/upload-artifact@v3
with:
name: "${{ steps.build.outputs.artifact }}-exe"
@ -225,6 +230,7 @@ jobs:
# The other upload of nontrivial size is the symbol file. Use a distinct
# artifact for that too.
- name: Upload symbol file
if: matrix.configuration != "ReleaseOS"
uses: actions/upload-artifact@v3
with:
name: "${{ steps.build.outputs.artifact }}-symbols"
@ -232,6 +238,7 @@ jobs:
${{ steps.build.outputs.symbolfile }}
- name: Upload metadata
if: matrix.configuration != "ReleaseOS"
uses: actions/upload-artifact@v3
with:
# Call this artifact just "Windows" or "macOS" because it's the only
@ -248,7 +255,7 @@ jobs:
- name: Upload physics package
uses: actions/upload-artifact@v3
# should only be set for viewer-private
if: steps.build.outputs.physicstpv
if: matrix.configuration != "ReleaseOS" && steps.build.outputs.physicstpv
with:
name: "${{ steps.build.outputs.artifact }}-physics"
# emitted by build.sh, zero or one lines