SL-18837: Conditionally upload llphysicsextensions-tpv package

but only when building viewer-private.

Also re-fix SL-19942 workaround by deleting AUTOBUILD_CONFIGURATION before
trying to build llphysicsextensions-tpv.

1 files changed, 13 insertions, 10 deletions

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1cc29d95ea..f0c7fdd496 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -192,18 +192,11 @@ jobs:
           # Given the size of our installers, and the fact that we typically
           # only want to download just one instead of a single zip containing
           # several, generate a distinct artifact name for each installer.
-          # Since the matrix above can run multiple builds on the same
+          # If the matrix above can run multiple builds on the same
           # platform, we must disambiguate on more than the platform name.
-          # 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.
-          # DEVELOPER_DIR="/Applications/Xcode_14.0.1.app/Contents/Developer"
-          # or the empty string, so this produces dev="Xcode_14.0.1" or ".".
-          dev="$(basename "$(dirname "$(dirname "$DEVELOPER_DIR")")" .app)"
-          artifact="$RUNNER_OS $dev"
-          # For empty DEVELOPER_DIR, dev is ".", so artifact can end up with
-          # appended " ." -- ditch that if present.
-          artifact="${artifact% .}"
-          echo "artifact=$artifact" >> $GITHUB_OUTPUT
+          echo "artifact=$RUNNER_OS" >> $GITHUB_OUTPUT
 
       - name: Upload installer
         uses: actions/upload-artifact@v3
@@ -229,3 +222,13 @@ jobs:
           # emitted by build.sh, possibly multiple lines
           path: |
             ${{ steps.build.outputs.metadata }}
+
+      - name: Upload physics package
+        uses: actions/upload-artifact@v3
+        # should only be set for viewer-private
+        if: steps.build.outputs.physicstpv
+        with:
+          name: "${{ steps.build.outputs.artifact }} physics"
+          # emitted by build.sh, zero or one lines
+          path: |
+            ${{ steps.build.outputs.physicstpv }}