From 1684d6249984e0ad8e13263da05f84cb5e6b84fb Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 3 Oct 2023 19:02:40 -0400
Subject: SL-19242: Remove signing and packaging from viewer_manifest.py

for Mac and Windows. That's now done by subsequent jobs in the GitHub build.
Remove workflow step to upload installers before signing and packaging jobs.

Remove from viewer_manifest.py conditionals for 32-bit Windows or Mac.

Also bump to actions/checkout@v4, per dependabot.
---
 .github/workflows/build.yaml      | 15 +++------------
 .github/workflows/pre-commit.yaml |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d1f617f301..cb3212d56a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -57,7 +57,7 @@ jobs:
       variants: ${{ matrix.configuration }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
@@ -67,14 +67,14 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Checkout build variables
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: secondlife/build-variables
           ref: viewer
           path: .build-variables
 
       - name: Checkout master-message-template
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: secondlife/master-message-template
           path: .master-message-template
@@ -212,15 +212,6 @@ jobs:
           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"
-          # emitted by build.sh, possibly multiple lines
-          path: |
-            ${{ steps.build.outputs.installer }}
-
       - name: Upload executable
         if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.viewer_app
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index 17c0ace02f..d626eef38d 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -11,7 +11,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x
-- 
cgit v1.2.3