summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-11 19:38:55 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-11 19:38:55 -0400
commitf31326189c99b18758b3754460d105a0195640c6 (patch)
treea18f0eb3b758e7da93905cfd77a02b66ba7e9293
parent62879b6e698a839784e1319e0d555c01ce0b4220 (diff)
SL-19242: Exclude installer from Windows-app artifact.
-rwxr-xr-xindra/newview/viewer_manifest.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8869831635..b994b304eb 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -499,9 +499,12 @@ class WindowsManifest(ViewerManifest):
if self.is_packaging_viewer():
# Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())
- # Emit the whole app image as one of the GitHub step outputs. When
- # we feed upload-artifact multiple absolute pathnames, even just
- # for exclusion, it ends up creating several extraneous directory
+ # Emit the whole app image as one of the GitHub step outputs. We
+ # want the whole app -- but NOT the extraneous build products that
+ # get tossed into the same directory, such as the installer and
+ # the symbols tarball, so add exclusions. When we feed
+ # upload-artifact multiple absolute pathnames, even just for
+ # exclusion, it ends up creating several extraneous directory
# levels within the artifact -- so try using only relative paths.
# One problem: as of right now, our current directory os.getcwd()
# is not the same as the initial working directory for this job
@@ -517,6 +520,7 @@ class WindowsManifest(ViewerManifest):
*(('!' + os.path.join(appbase, pattern))
for pattern in (
'secondlife-bin.*',
+ '*_Setup.exe',
'*.bat',
'*.tar.bz2',
'*.nsi')))