Make sure our macOS flow mirrors Windows.

Author: Geenz

.github/workflows/build.yaml

@@ -61,13 +61,20 @@ jobs:
       relnotes:       ${{ steps.which-branch.outputs.relnotes }}
       imagename:      ${{ steps.build.outputs.imagename }}
       configuration:  ${{ matrix.configuration }}
+      # Windows Velopack outputs (passed to sign-pkg-windows)
       velopack_pack_id:       ${{ steps.build.outputs.velopack_pack_id }}
       velopack_pack_version:  ${{ steps.build.outputs.velopack_pack_version }}
       velopack_pack_title:    ${{ steps.build.outputs.velopack_pack_title }}
       velopack_main_exe:      ${{ steps.build.outputs.velopack_main_exe }}
       velopack_exclude:       ${{ steps.build.outputs.velopack_exclude }}
       velopack_icon:          ${{ steps.build.outputs.velopack_icon }}
       velopack_installer_base: ${{ steps.build.outputs.velopack_installer_base }}
+      # macOS Velopack outputs (passed to sign-pkg-mac)
+      velopack_mac_pack_id:      ${{ steps.build.outputs.velopack_mac_pack_id }}
+      velopack_mac_pack_version: ${{ steps.build.outputs.velopack_mac_pack_version }}
+      velopack_mac_pack_title:   ${{ steps.build.outputs.velopack_mac_pack_title }}
+      velopack_mac_main_exe:     ${{ steps.build.outputs.velopack_mac_main_exe }}
+      velopack_mac_bundle_id:    ${{ steps.build.outputs.velopack_mac_bundle_id }}
     env:
       AUTOBUILD_ADDRSIZE: 64
       AUTOBUILD_BUILD_ID: ${{ github.run_id }}
@@ -395,6 +402,11 @@ jobs:
           note_user: ${{ steps.note-creds.outputs.note_user }}
           note_pass: ${{ steps.note-creds.outputs.note_pass }}
           note_team: ${{ steps.note-creds.outputs.note_team }}
+          velopack_pack_id: "${{ needs.build.outputs.velopack_mac_pack_id }}"
+          velopack_pack_version: "${{ needs.build.outputs.velopack_mac_pack_version }}"
+          velopack_pack_title: "${{ needs.build.outputs.velopack_mac_pack_title }}"
+          velopack_main_exe: "${{ needs.build.outputs.velopack_mac_main_exe }}"
+          velopack_bundle_id: "${{ needs.build.outputs.velopack_mac_bundle_id }}"
 
   post-windows-symbols:
     env:

indra/newview/viewer_manifest.py

@@ -1249,24 +1249,39 @@ def velopack_package_finish(self):
 
         # The .app bundle path (e.g., "/path/to/Second Life Release.app")
         app_bundle = self.get_dst_prefix()
+        # Bundle ID from args (e.g., "com.secondlife.viewer")
+        bundle_id = self.args.get('bundleid', 'com.secondlife.indra.viewer')
+
+        # Icon path for macOS
+        icon_path = os.path.join(self.get_src_prefix(), self.icon_path(), 'secondlife.icns')
+
+        # The main executable inside Contents/MacOS/ is named after the channel
+        main_exe = self.channel()
+
+        # In CI, defer Velopack packaging to the sign step where code signing
+        # credentials are available. Emit metadata as GitHub outputs so the
+        # sign step can run vpk pack after signing the app bundle.
+        if os.getenv('GITHUB_ACTIONS'):
+            self.set_github_output('velopack_mac_pack_id', pack_id)
+            self.set_github_output('velopack_mac_pack_version', pack_version)
+            self.set_github_output('velopack_mac_pack_title', pack_title)
+            self.set_github_output('velopack_mac_main_exe', main_exe)
+            self.set_github_output('velopack_mac_bundle_id', bundle_id)
+            print("CI mode: macOS Velopack packaging deferred to sign step")
+            return
+
+        # Local builds: run vpk pack directly (unsigned)
+
         # Parent directory containing the .app bundle - this is where we run vpk from
         # and where the Releases directory will be created
         work_dir = os.path.dirname(app_bundle)
-        # Bundle ID from args (e.g., "com.secondlife.viewer")
-        bundle_id = self.args.get('bundleid', 'com.secondlife.indra.viewer')
 
         # Output directory for releases - clean it first to avoid version conflicts
         releases_dir = os.path.join(work_dir, 'Releases')
         if os.path.exists(releases_dir):
             print("Cleaning existing Releases directory: %s" % releases_dir)
             shutil.rmtree(releases_dir)
 
-        # Icon path for macOS
-        icon_path = os.path.join(self.get_src_prefix(), self.icon_path(), 'secondlife.icns')
-
-        # The main executable inside Contents/MacOS/ is named after the channel
-        main_exe = self.channel()
-
         # Build vpk command for macOS
         # See: https://docs.velopack.io/reference/cli/content/vpk-osx
         vpk_args = [