Commit Graph

581 Commits (master)

Author SHA1 Message Date
Beq 1be32f31fe [build] initial commit of fs-build-tagger 2024-09-25 22:34:03 +01:00
Beq 7edbaaf40a [build] Unpack dSYM from xcarchive before upload 2024-09-25 21:54:03 +01:00
Ansariel 8d35ee3029 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-09-17 17:12:45 +02:00
Beq 3e8217a24d Fix the deployment path on the deploy only file upload. 2024-09-16 21:48:48 +01:00
Beq 7e2122f436 Need a key to get in. 2024-09-16 19:45:07 +01:00
Beq 905857aee0 downloader does not provide the required step output 2024-09-16 18:20:46 +01:00
Beq f9eb2f5789 better parameters to the downloader 2024-09-16 18:07:35 +01:00
Beq aa9dcc48ce Let's see if we can get a deploy_only option to work.
Use a newer download action
2024-09-16 17:53:15 +01:00
Beq 33dbff8d7c Massive overhaul of build publishing
This will doubtless break horribly.
2024-09-16 02:25:56 +01:00
Beq 2673522b20 Revert back to Bugsplat-Git now that they've merged my fix
We may still need to use mine, so let's test
2024-09-15 13:58:21 +01:00
Ansariel 82e8fd1671 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/en/notifications.xml
2024-09-09 19:50:00 +02:00
Beq 3aae77cc6f Capture the BUGSPLAT_DB and fix Mac executable name 2024-09-06 17:47:00 +01:00
Ansariel 65b0056cbd Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
2024-09-04 23:20:53 +02:00
Beq 240f69f830 correct case for VIEWER_VERSION.txt 2024-09-04 00:44:07 +01:00
Beq 96ef422551 Let's just try Linux without the dumpSyms 2024-09-03 22:11:08 +01:00
Beq 6b2e9ffb77 Linux needs pwsh for the dump-syms...
We'll see if installing ti works before we resort to cloning the action and rewriting it to bash
2024-09-03 16:15:58 +01:00
Beq 85b07d8817 Updated npm packages in GitHub workflow
npm dump-syms installation can fallback to source building. This has a dependency on pre-gyp to grab cargo.
2024-09-03 13:43:06 +01:00
Beq 46677f3877 Updated workflow for symbol upload
The GitHub Actions workflow has been updated to handle different types of releases. The changes include:
- Replaced the package in the node-dump-syms installation step.
- Expanded the conditions for setting clientId, clientSecret, and database based on viewer_release_type.
- Added support for 'Nightly', 'Manual', 'Beta', and 'Alpha' release types besides the existing 'Release'.
- Default secrets are used if none of the conditions match.
2024-09-03 00:06:10 +01:00
Beq acae30fd28 Added node-dump-syms installation for Linux
In the GitHub workflow, a step has been added to install node-dump-syms when the runner OS is Linux. Also, the file path for Windows in Post Bugsplat Symbols has been updated to specifically target Release files.
2024-09-02 17:39:41 +01:00
Beq aeb146f269 optimise the file specs. also use beq fork to enable dumpSyms 2024-09-02 15:38:08 +01:00
Beq c9f773b25c Tweak BugSplat submission recipe
Different builds ahave different secrets
Unify rules for x-platform to reduce duplication.
2024-09-02 12:09:01 +01:00
Beq f186f3f1d1 Exploring bugsplat symbol auto-upload. 2024-09-01 22:01:33 +01:00
Ansariel bddb0fb749 Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer 2024-08-23 11:43:20 +02:00
Brad Linden 1adf2d00eb Fix usage of $branch before it was initialized in build. 2024-08-22 15:46:48 -07:00
Ansariel 571155c561 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llfilesystem/lldiskcache.h
#	indra/llfilesystem/llfilesystem.cpp
#	indra/llui/llaccordionctrl.cpp
#	indra/llui/llaccordionctrl.h
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/llfloatertools.cpp
#	indra/newview/llfloatertools.h
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpreviewnotecard.cpp
#	indra/newview/llpreviewnotecard.h
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewtexture.cpp
#	indra/newview/llscreenchannel.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
2024-08-19 18:55:52 +02:00
Ansariel 07228d3a9e Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/LLPrimitive.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/Tracy.cmake
#	indra/llappearance/llavatarappearancedefines.cpp
#	indra/llcommon/llprofiler.cpp
#	indra/llcommon/llprofiler.h
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llfilesystem/lldiskcache.h
#	indra/llinventory/llinventorytype.cpp
#	indra/media_plugins/example/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llgroupmgr.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatarself.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/viewer_manifest.py
2024-08-15 00:12:13 +02:00
Andrey Lihatskiy b93529526b
ReleaseOS build fix (#2299) 2024-08-15 00:56:39 +03:00
nat-goodspeed 633e200af1
Merge pull request #2275 from secondlife/nat/edu-channel
Allow triggering an EDU build with a tag containing "edu"
2024-08-14 15:35:19 -04:00
Brad Linden 2921deed78
Skip windows symbol upload if there was no Release config build. (#2280) 2024-08-13 13:42:52 -07:00
Nat Goodspeed 23f2631d59 Merge branch 'develop' into nat/edu-channel 2024-08-13 15:32:47 -04:00
Signal Linden 8ce3323269
CI: Upload ReleaseOS app (#2252)
Upload the built app on ReleaseOS builds. Not sure why we wouldn't want this.
2024-08-13 12:12:48 -07:00
Nat Goodspeed dc314602d5 Allow triggering an EDU build with a tag containing "edu" 2024-08-13 11:30:41 -04:00
Signal Linden dff3fdbfd7
Adopt NSIS 3.0 (#2248) 2024-08-11 16:44:39 -07:00
Ansariel 028933621e Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
# Conflicts:
#	indra/llui/llscrolllistctrl.cpp
2024-08-10 13:57:24 +02:00
Ansariel 25b7fd4fa9 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/CMakeLists.txt
#	indra/newview/llspeakers.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicewebrtc.cpp
2024-08-10 13:04:14 +02:00
Ansariel b35e4d26d1 Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/lleventpoll.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoicewebrtc.cpp
2024-08-10 12:51:51 +02:00
Ansariel f4f39e502b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-08-10 11:39:21 +02:00
Brad Linden c106221726 Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
 #	.github/workflows/build.yaml
 #	indra/llui/llscrolllistctrl.cpp
2024-08-09 15:43:06 -07:00
Brad Linden 3b2c32fdf9 Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
 #	.github/workflows/build.yaml
 #	indra/newview/CMakeLists.txt
 #	indra/newview/llspeakers.cpp
 #	indra/newview/llvoicechannel.cpp
 #	indra/newview/llvoicechannel.h
 #	indra/newview/llvoiceclient.cpp
 #	indra/newview/llvoiceclient.h
 #	indra/newview/llvoicewebrtc.cpp
2024-08-09 15:10:13 -07:00
Roxie Linden d46c444aee Use the secondlife-3p fork of symbol upload, which has vMAJOR tags 2024-08-08 12:05:16 -07:00
Ansariel 46e5e87315 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus 2024-08-08 18:55:33 +02:00
Ansariel bafc3a31e9 Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer 2024-08-08 18:54:46 +02:00
Roxie Linden cfe84b7f38 Merge branch 'roxie/webrtc-symbols' of github.com:secondlife/viewer into roxie/webrtc-symbols 2024-08-08 09:35:36 -07:00
Roxie Linden f1f3aa42e8 CR fixes 2024-08-08 09:34:48 -07:00
Roxie Linden 83390094f1 test llwebrtc.dll for additional symbols 2024-08-07 22:01:46 -07:00
Roxie Linden 60003cf077 include viewer exe in uploaded symbols 2024-08-07 19:09:19 -07:00
Roxie Linden 530bc29753 build debug symbols for llwebrtc even for release 2024-08-07 16:33:00 -07:00
Roxie Linden f6f3d7e048 spacing issue 2024-08-07 14:24:00 -07:00
Roxie Linden 63a4ad9b98 Add Windows multi-pdb upload capability 2024-08-07 14:16:11 -07:00
Andrey Kleshchev 399eb2104e viewer#2043 bugsplat symbol upload update 2024-08-07 20:12:59 +03:00
Roxie Linden 753cf01ef0 don't need to post dylib as we're using xcarchive 2024-08-06 22:24:38 -07:00
Roxie Linden fc0e70e77b upload xcarchive to bugsplat 2024-08-06 21:00:48 -07:00
Roxie Linden c52c25e10d As bugspat upload is broken for dylibs within .dSYM bundles, upload the dylibs directly 2024-08-06 12:06:40 -07:00
Beq 70db3e372f Merge branch 'master' into webrtc_alpha 2024-08-06 11:56:14 +01:00
Beq d48f3cb69c Introduce separate webhook for manual builds
Reduce noise by segregating automated and manually triggered build notifications.
2024-08-06 11:48:06 +01:00
Roxie Linden 83c1f45dba Download osx artifacts to working directory 2024-08-06 00:26:43 -07:00
Roxie Linden 07573f7e10 allow paths with spaces 2024-08-05 23:16:48 -07:00
Roxie Linden 293187e04b Build mac symbols for multiple binaries/dynamic libraries and upload them all to bugsplat 2024-08-05 18:17:03 -07:00
Ansariel ad60f1cbee Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llfloaterworldmap.h
#	indra/newview/llworldmap.h
#	indra/newview/skins/default/xui/en/floater_world_map.xml
2024-08-03 00:47:13 +02:00
Andrey Lihatskiy 01688e5216
Use dedicated property to determine if build is called from a fork (#2183) 2024-08-02 20:48:06 +03:00
Ansariel 04bed35215 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llwebrtc/llwebrtc.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
2024-08-02 13:01:06 +02:00
Signal Linden dfa7d60a72
build.yaml: Fix FROM_FORK value, ReleaseOS PR builds (#2147) 2024-07-30 10:09:49 -07:00
Ansariel 02680c6a8f Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llxml/llxmltree.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llfloaterworldmap.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroup.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
Ansariel eaa5dc798c Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
# Conflicts:
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llversioninfo.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-30 10:45:11 +02:00
Bennett Goble a247902e3d build.yaml: Remove unused BUILD variable 2024-07-29 09:52:59 -07:00
Bennett Goble 60d91f8e75 Fix PR builds from forks
Build ReleaseOS when a PR is from a fork rather than Release.
This fixes OSS PR builds which, until now, have been failing because they cannot access secrets.
2024-07-28 23:11:58 -07:00
Ansariel 450d02ad39 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/ISSUE_TEMPLATE/10-bug.yaml
#	indra/llui/lldockcontrol.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llviewereventrecorder.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgrouproles.cpp
#	indra/newview/llpanelland.cpp
#	indra/newview/llphysicsmotion.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltoolpie.cpp
#	indra/newview/llviewermenu.cpp
2024-07-25 20:47:57 +02:00
Andrey Kleshchev 57e78ed43b viewer#2043 bugsplat symbol upload update 2024-07-23 22:51:31 +03:00
Beq ec4ad10e1a Use the default compiler version on Linux 2024-07-19 09:51:55 +01:00
Ansariel ebc0482bc0 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-07-18 20:14:24 +02:00
Ansariel 99396c859d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-10 10:31:35 +02:00
Ansariel 9a2b83b294 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llmemory.cpp
#	indra/llmessage/CMakeLists.txt
#	indra/llmessage/llfiltersd2xmlrpc.cpp
#	indra/newview/lldebugview.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/llheroprobemanager.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llslurl.cpp
#	indra/newview/llsurface.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llversioninfo.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llworld.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/floater_about.xml
#	indra/newview/skins/default/xui/de/menu_viewer.xml
#	indra/newview/skins/default/xui/en/floater_about.xml
#	indra/newview/skins/default/xui/es/floater_about.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/floater_about.xml
#	indra/newview/skins/default/xui/it/floater_about.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/ja/menu_viewer.xml
#	indra/newview/skins/default/xui/pl/menu_viewer.xml
#	indra/newview/skins/default/xui/pt/floater_about.xml
#	indra/newview/skins/default/xui/pt/menu_viewer.xml
#	indra/newview/skins/default/xui/ru/floater_about.xml
#	indra/newview/skins/default/xui/ru/menu_viewer.xml
#	indra/newview/skins/default/xui/tr/floater_about.xml
#	indra/newview/skins/default/xui/tr/menu_viewer.xml
#	indra/newview/skins/default/xui/zh/floater_about.xml
#	indra/newview/skins/default/xui/zh/menu_viewer.xml
#	scripts/messages/message_template.msg.sha1
2024-07-02 18:08:57 +02:00
Ansariel 20294e9ee8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-02 01:23:35 +02:00
Beq d7c3e112fa [GHA] Add option to create Tracy builds on workflow triggers 2024-06-24 01:30:04 +01:00
Beq df9e0f7e12 [GHA] See if we can replace 3rd party action with standard checkout 2024-06-24 01:30:04 +01:00
Ansariel 45ab5c68ee Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llrender/llgl.h
#	indra/newview/fspanelface.cpp
#	indra/newview/fspanelface.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llheroprobemanager.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/vjlocalmesh.cpp
2024-06-21 19:58:00 +02:00
Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/llcommon/llsys.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
2024-06-21 19:46:51 +02:00
Brad Linden 32b912af9a Make sure TAG_ID actually gets added to GITHUB_ENV 2024-06-20 17:15:16 -07:00
Brad Linden aa6161ca94 Shorten SHA value used in tag id and attempt to fix js/yaml syntax error 2024-06-20 17:10:00 -07:00
Brad Linden e165be0007 Attempt to use provided GITHUB_TOKEN and generate tag id from inputs 2024-06-18 14:31:41 -07:00
Brad Linden 05efb1494d Fix yaml indentation of javascript snippet in tag-release workflow 2024-06-17 19:17:18 -07:00
Brad Linden f5659945b5 Fix secret name since GITHUB_ prefix is reserved 2024-06-17 18:54:45 -07:00
Brad Linden 3da16d1899 Attempt to fix tag-release workflow by moving conditional secrets usage into env 2024-06-17 18:38:00 -07:00
Brad Linden 352dff6830
Attempt to fix workflow syntax in new tag-release workflow (#1792) 2024-06-17 18:32:24 -07:00
Brad Linden dd64c39d64 Pass through input channel to select the tag channel name 2024-06-17 17:55:29 -07:00
Brad Linden b9a8b3b240 Update naming and add options to tag-release workflow_dispatch. 2024-06-17 17:43:02 -07:00
Brad Linden 84a221e7dd Renamed tag-nightly.yaml to generalize it to other tags when using workflow_dispatch 2024-06-17 17:41:53 -07:00
Brad Linden 0e1e1685d4 Skip the actual tag update step gracefully until we have proper tokens set up 2024-06-13 18:14:21 -07:00
Brad Linden b9f287815a Add new viewer_channel detection for develop branch 2024-06-13 17:55:05 -07:00
Brad Linden 41cb778fb0 Initial work setting up scheduled releases for develop branch. 2024-06-13 17:41:17 -07:00
Beq a2d7d84e0c Move macos builds to Macos12 ahead of github removing the support. 2024-06-14 00:23:54 +01:00
Ansariel 8565041c2d Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
2024-06-12 11:38:14 +02:00
Ansariel d99fbffb6d Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llmath/llvolume.cpp
#	indra/newview/gltf/asset.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvovolume.cpp
2024-06-11 20:25:22 +02:00
Andrey Lihatskiy ef9f4b38e9 Merge branch 'main' into DRTVWR-600-maint-A 2024-06-11 17:51:35 +03:00
Brad Linden 2e41f5a35e Try to get sign-and-package-windows job a runner to run on 2024-06-10 16:11:29 -07:00
Ansariel 591c75ebaf Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmessage/llcorehttputil.cpp
#	indra/llrender/llgl.cpp
#	indra/newview/installers/darwin/apple-notarize.sh
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llfloater360capture.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
Bennett Goble a0b3021bdc Trim trailing whitespace
Start trimming trailing whitespace, but limit the blast radius to a
handful of file types.
2024-05-29 08:10:00 -07:00
Ansariel c1cf268935 Merge branch 'main' of https://github.com/secondlife/viewer 2024-05-22 19:25:17 +02:00
Ansariel 4b0ad849a9 Merge remote-tracking branch 'LL/project/webrtc-voice'
# Conflicts:
#	autobuild.xml
#	indra/cmake/WebRTC.cmake
2024-05-21 00:42:55 +02:00
Beq 191b9395dd check trigger properly 2024-05-17 12:09:54 +01:00
Beq b094dbed41 Refactor the expiry date code and allow manual trigger 2024-05-17 11:50:44 +01:00
Brad Linden e1623bb276
Merge pull request #1489 from secondlife/brad/fix-mac-channel
Fix channel detection for mac builds
2024-05-16 09:55:50 -07:00
Brad Linden 8011d3f457 Fix channel detection for mac builds 2024-05-15 16:08:04 -07:00
Brad Linden 7feec9998e Move all release_run logic into setvar job. 2024-05-15 15:12:52 -07:00
Brad Linden 0960ae7892 Experiment with getting manually triggered workflow builds to optionally do a release 2024-05-15 14:49:07 -07:00
Nat Goodspeed 1f0b80f709 Streamline the new workflow `RELEASE_RUN` logic a little.
Since downstream jobs reference the output of the new `setvar` job, instead of
directly referencing global `env.RELEASE_RUN`, no need to set `RELEASE_RUN` in
the global environment.
2024-05-15 17:15:25 -04:00
Nat Goodspeed f822193974 Make env.RELEASE_RUN the empty string if false
not the string "false", which is true.
2024-05-15 16:08:54 -04:00
Nat Goodspeed 18c1458409 Can't reference global env in job.if either. 2024-05-15 16:01:26 -04:00
Nat Goodspeed 9d30040dfe Try to work around workflow YAML env setting limitation. 2024-05-15 15:57:50 -04:00
Nat Goodspeed a4d2574df2 Run ReleaseOS builds, but only when a release page is requested. 2024-05-13 13:46:42 -04:00
Ansariel f5d4e5f50a Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2024-05-13 17:29:24 +02:00
Nat Goodspeed 4f70946048 Fix syntax error in build.yaml to enable Windows ReleaseOS 2024-05-11 10:14:49 -04:00
Nat Goodspeed afd726979a Turn on GH Windows ReleaseOS build 2024-05-11 09:58:22 -04:00
Vir Linden 6eeef10cda
Update build.yaml 2024-05-02 10:08:46 -04:00
Vir Linden eb0f963b46
Update build.yaml 2024-05-02 09:48:26 -04:00
Vir Linden 7f23f160d7 trim trailing whitespace 2024-05-01 17:51:44 +01:00
Vir Linden 65495ba765 set viewer channel from branch 2024-05-01 16:42:09 +01:00
Vir Linden a3602d660c
Merge pull request #1323 from secondlife/main
Update from main
2024-04-24 16:02:42 -04:00
Ansariel 2c52b8b243 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/fix-incredibuild.py
#	indra/newview/CMakeLists.txt
#	indra/newview/llscrollingpanelparam.cpp
#	indra/newview/viewer_manifest.py
2024-04-24 16:27:23 +02:00
Vir Linden 6ca4dfdb56
Update build.yaml 2024-04-19 16:16:26 -04:00
Vir Linden a65de93541 https://github.com/secondlife/viewer/issues/1286 - branch var from github.repository 2024-04-19 19:51:19 +01:00
Vir Linden f39987f382 https://github.com/secondlife/viewer/issues/1286 - branch var from github.repository 2024-04-19 19:47:46 +01:00
Vir Linden c2730b4fff https://github.com/secondlife/viewer/issues/1286 - determine viewer_channel from branch name in builds 2024-04-19 16:44:59 +01:00
Vir Linden b340042a3f
https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml 2024-04-16 12:19:09 -04:00
Bennett Goble 0f94ea86d4 CI: adopt xz compression
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
2024-04-11 15:18:42 -07:00
Bennett Goble 7fa24d636e CI: Remove python-version from matrix
Drop python version from matrix configuration as it's always 3.11.
2024-04-11 00:16:17 -07:00
Ansariel bc2b88be93 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-09 19:46:31 +02:00
Beq Janus f05d34ee5a
Merge pull request #18 from FirestormViewer/dependabot/github_actions/actions/setup-python-5
Bump actions/setup-python from 4 to 5
2024-04-03 17:25:27 +01:00
Beq Janus 7c3ff3cf29
Merge pull request #19 from FirestormViewer/dependabot/github_actions/actions/stale-9
Bump actions/stale from 6 to 9
2024-04-03 17:25:11 +01:00
Beq Janus a7df4ad1e8
Merge pull request #20 from FirestormViewer/dependabot/github_actions/actions/labeler-5
Bump actions/labeler from 4 to 5
2024-04-03 17:24:51 +01:00
dependabot[bot] eb9f799c9f
Bump actions/setup-python from 4 to 5
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:14:34 +00:00
Beq Janus 64a62350dd
Merge pull request #21 from FirestormViewer/dependabot/github_actions/pre-commit/action-3.0.1
Bump pre-commit/action from 3.0.0 to 3.0.1
2024-04-03 17:13:36 +01:00
dependabot[bot] 0234b6252d
Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:11:12 +00:00
dependabot[bot] fe3ad7735d
Bump pre-commit/action from 3.0.0 to 3.0.1
Bumps [pre-commit/action](https://github.com/pre-commit/action) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/pre-commit/action/releases)
- [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: pre-commit/action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:11:07 +00:00
dependabot[bot] 347f68c790
Bump actions/labeler from 4 to 5
Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:11:02 +00:00
dependabot[bot] 0fcc9fe246
Bump actions/stale from 6 to 9
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 9.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v9)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:10:58 +00:00
Beq 9abf29e995 A bunch more changes for notarising.
fingers crossed.
2024-04-01 22:45:17 +01:00
Beq 45d093f4eb Update Linux distro to Ubuntu 22.04 2024-03-28 10:22:28 +00:00
Ansariel cbf6aca2e8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 10:35:43 +01:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
Ansariel 1f75fbd3b5 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerwindow.cpp
2024-03-26 22:43:42 +01:00
Nat Goodspeed c810a409e2 Merge GLTF PBR Maint 2 to main. 2024-03-26 16:55:32 -04:00
Brad Linden 231062d532 Fix github actions dependency deprecations 2024-03-12 17:49:19 -07:00
Andrey Lihatskiy 091ee67ec5 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-09 19:46:09 +02:00
Nat Goodspeed 74ee07d942 To test for presence of secrets, set environment variables.
From https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#using-secrets-in-a-workflow :

"Secrets cannot be directly referenced in if: conditionals. Instead, consider
setting secrets as job-level environment variables, then referencing the
environment variables to conditionally run steps in the job."
2024-03-05 14:23:32 -05:00
Nat Goodspeed 73a12f5529 Enclose 'if:' expressions in ${{ ... }}.
The previous construct produced:

Unrecognized named-value: 'secrets'. Located at position 1 within expression:
secrets.AZURE_KEY_VAULT_URI && ...
2024-03-05 13:50:38 -05:00
Nat Goodspeed 6328cb7817 Make signing and symbol posting jobs conditional on secrets.
Specifically, when secrets aren't available (e.g. for external PRs), skip the
affected steps.
2024-03-05 13:36:18 -05:00
Signal Linden e07bf1c0a2
Do not automatically close issues (#929)
Mark issues as stale but do not close them.
2024-03-04 17:32:35 -08:00
Ansariel 2827ebf04f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 22:47:21 +01:00
Nat Goodspeed 9b8800f216 Now that viewer-build-util@relnotes has merged to v1, use @v1. 2024-03-01 16:43:15 -05:00
Nat Goodspeed 00d7fef75e Reference updated action-gh-release@v1
instead of the branch that got pulled.

(cherry picked from commit b42e01d7ac)
2024-03-01 16:19:02 -05:00
Nat Goodspeed 3ee3e011ff Base generated release notes on new floating tag 'release'
instead of on the current tag 7.1.2-release.

(cherry picked from commit 27b298d8bc)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 7ad13c8511 Leverage action-gh-release's new previous_tag input.
This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.

(cherry picked from commit 88ebb92f05)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 7c52db381c Try basing release notes on github.sha rather than github.ref_name.
(cherry picked from commit 4edd78f2e5)
2024-03-01 16:19:01 -05:00
Nat Goodspeed d7e6a7dbd0 Try basing the GH release on github.ref_name instead of github.ref.
Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]

(cherry picked from commit c6a6db8488)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 603d3a865a Try to generate release notes for this specific branch.
Also try to cross-reference release page and build page.

(cherry picked from commit a908b4cfa9)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 9f326f5b96 Engage new viewer-build-util/which-branch with relnotes output.
Put whatever release notes we retrieve into the generated release page.

(cherry picked from commit ff543b744e)
2024-03-01 16:19:01 -05:00
Nat Goodspeed a8cd70123b SL-20546: PyGithub was only needed for local which_branch.py.
Now that which_branch.py has moved to viewer-build-util, so has the PyGithub
dependency.

(cherry picked from commit dd0ec112fe)
2024-03-01 16:13:29 -05:00
Nat Goodspeed 8f68199ccd SL-20546: Use branch for autobuild package as well as release page.
which_branch.py has moved to viewer-build-util as a reusable action.

(cherry picked from commit 09f66828ba)
2024-03-01 16:13:29 -05:00
Nat Goodspeed 9b3d4325d9 DRTVWR-601: Use viewer-build-util/which-branch to determine branch.
(cherry picked from commit 2c5066f1fc)
(cherry picked from commit ff1741ceca)
2024-03-01 16:13:29 -05:00
Nat Goodspeed 8590ce0533 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.

(cherry picked from commit b782ab73e6)
(cherry picked from commit 6e8d4f4846)
2024-03-01 16:13:29 -05:00
Nat Goodspeed cfbef4e4f9 SL-20546: Make dependency on build job explicit, not indirect.
The release job has been dependent on sign-and-package-windows and
sign-and-package-mac, each of which depends on build. But that indirect
dependency doesn't convey access to ${{ needs.build.outputs.xxx }}. Add the
build job to direct dependencies so release can access its outputs.

(cherry picked from commit 819604d2ce)
2024-03-01 16:13:29 -05:00
Nat Goodspeed e4865db0ca SL-20546: Add PyGithub to installed Python packages.
(cherry picked from commit 6654ad14ee)
2024-03-01 16:13:29 -05:00
Nat Goodspeed a13e70aeff SL-20546: Try harder to infer the branch corresponding to build tag.
(cherry picked from commit 59eeaed118)
2024-03-01 16:13:29 -05:00
Nat Goodspeed cac7023996 SL-20546: Append generated release notes body to our explicit body.
For a tag build that generates a release page, try to deduce the git branch to
which the tag we're building corresponds and add that to release notes.

(cherry picked from commit 9e99bb04a3)
2024-03-01 16:13:29 -05:00
Nat Goodspeed e0ae227d0a SL-20546: Add viewer channel and full version to GitHub release page.
(cherry picked from commit f71662225e)
2024-03-01 16:13:28 -05:00
Ansariel c63b3eca4c Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llurlregistry.cpp
#	indra/newview/llcontrolavatar.cpp
2024-03-01 21:00:56 +01:00
Ansariel 203ac04bf6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_stats.xml
2024-03-01 20:49:42 +01:00
Ansariel cb43d15c23 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	README.md
2024-03-01 20:07:23 +01:00
Ansariel e13ab75b9b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 20:05:51 +01:00
Nat Goodspeed b42e01d7ac Reference updated action-gh-release@v1
instead of the branch that got pulled.
2024-02-28 08:45:12 -05:00
Nat Goodspeed 27b298d8bc Base generated release notes on new floating tag 'release'
instead of on the current tag 7.1.2-release.
2024-02-26 17:05:56 -05:00
Nat Goodspeed 88ebb92f05 Leverage action-gh-release's new previous_tag input.
This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.
2024-02-26 15:51:31 -05:00
Nat Goodspeed 4edd78f2e5 Try basing release notes on github.sha rather than github.ref_name. 2024-02-26 13:26:29 -05:00
Nat Goodspeed c6a6db8488 Try basing the GH release on github.ref_name instead of github.ref.
Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]
2024-02-26 12:20:31 -05:00
Nat Goodspeed a908b4cfa9 Try to generate release notes for this specific branch.
Also try to cross-reference release page and build page.
2024-02-26 11:23:47 -05:00
Andrey Lihatskiy 6ae83f06d8
Merge branch 'main' into DRTVWR-588-maint-W 2024-02-21 22:01:44 +02:00
Beq d5e1b538d7 Update imported actions to remove deprecated JS dependency 2024-02-15 20:03:42 +00:00
Nat Goodspeed ff543b744e Engage new viewer-build-util/which-branch with relnotes output.
Put whatever release notes we retrieve into the generated release page.
2024-02-15 11:21:31 -05:00
Brad Linden 255bb8504d
Update cla.yaml allowlist to clear spurious errors (#804) 2024-02-14 09:54:46 -08:00
Ansariel dd3b29d82c Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2024-02-14 18:05:08 +01:00
Brad Linden bf2fb55fe7 Update cla.yaml allowlist to clear spurious errors 2024-02-14 17:17:58 +02:00
Beq 40a64ed70c Make windows testbuilds expire properly
hint: don't use bash style variable setting in powershell
2024-02-12 22:26:45 +00:00
Ansariel 86230977c4 Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
# Conflicts:
#	README.md
2024-02-11 19:46:50 +01:00
Brad Linden 23d44cb665 Merge remote-tracking branch 'origin/main' into release/gltf-maint2 2024-02-07 13:09:35 -08:00
Bennett Goble 27e3fdc957 build.yaml: Build shared branches
We're currently building every single commit pushed to Github. This is
racking up $20k in build charges a month and is generally superfluous.

This changeset alters build triggers so that builds automatically run if
they are committed to a **shared branch**:

- `release/*` - A release stabilization branch
- `project/*` - A project viewer branch
- `main/*` - The default/stable branch

PR commits are also automatically built.

...need to build another commit? Developers can trigger one using a
manual workflow run.
2024-01-31 13:26:14 -08:00
Ansariel 04d32cf7eb Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llviewermenu.cpp
#	indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
#	indra/newview/skins/default/xui/en/floater_world_map.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/en/panel_profile_pick.xml
#	indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2024-01-26 14:29:44 +01:00
Ansariel fa05f94eae Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
2024-01-23 12:23:54 +01:00
Nat Goodspeed 6555fb3409 SL-20546: Use viewer-build-util@v1 instead of PR branch.
The fix we wanted was on the pr-branch branch of the viewer-build-util repo.
Now that it's been published as v1.1.2, the updated v1 tag references the fix,
so revert mention to @v1.
2024-01-18 21:35:48 -05:00
Nat Goodspeed 834cc3d1e0 SL-20546: Test new viewer-build-util branch pr-branch. 2024-01-18 15:21:15 -05:00
Nat Goodspeed dd0ec112fe SL-20546: PyGithub was only needed for local which_branch.py.
Now that which_branch.py has moved to viewer-build-util, so has the PyGithub
dependency.
2024-01-18 13:43:34 -05:00
Nat Goodspeed 09f66828ba SL-20546: Use branch for autobuild package as well as release page.
which_branch.py has moved to viewer-build-util as a reusable action.
2024-01-18 13:34:40 -05:00
Nat Goodspeed ff1741ceca DRTVWR-601: Use viewer-build-util/which-branch to determine branch.
(cherry picked from commit 2c5066f1fc)
2024-01-18 13:29:39 -05:00
Nat Goodspeed 6e8d4f4846 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.

(cherry picked from commit b782ab73e6)
2024-01-18 13:29:39 -05:00
Nat Goodspeed fea1d9f4d2 SL-20546: Merge branch 'DRTVWR-588-maint-W' into sl-20546. 2024-01-18 13:15:32 -05:00
Ansariel 3bd76c0fea Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llfasttimerview.cpp
#	indra/newview/skins/default/xui/en/widgets/color_swatch.xml
#	indra/newview/skins/default/xui/en/widgets/texture_picker.xml
2024-01-09 09:37:38 +01:00
Beq 99851ed459 disable viewer_version extraction rule for now 2023-12-29 14:41:12 +00:00
Beq 5aa47877a2 Export python binary in ENV to satisfy CMake
Use env var to force the python version
set python for Cmake and remove python cache
2023-12-29 02:35:34 +00:00
Beq 549e7ff3c1 ensure python & python3 have the same requirements set 2023-12-29 02:34:56 +00:00
Beq 5198af498a switch windows python back to defaults 2023-12-29 02:34:35 +00:00
Beq b6d55cc43b quick patch - not a fix, these will not run
clean up variable declarations and prep for bugsplat sym upload

bash variables hate whitespace
2023-12-29 02:34:09 +00:00
Beq 7db1a5ce49 fail means fail 2023-12-27 19:12:38 +00:00
Nat Goodspeed 2c5066f1fc DRTVWR-601: Use viewer-build-util/which-branch to determine branch. 2023-12-18 17:35:23 -05:00
Nat Goodspeed b782ab73e6 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.
2023-12-18 10:59:03 -05:00
Ansariel 783e488a63 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llspatialpartition.cpp
2023-12-15 22:48:56 +01:00
Ansariel e3c2f12d53 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/skins/default/xui/da/panel_main_inventory.xml
#	indra/newview/skins/default/xui/pt/panel_main_inventory.xml
#	indra/newview/skins/default/xui/tr/panel_main_inventory.xml
#	indra/newview/skins/default/xui/zh/panel_main_inventory.xml
2023-12-15 18:25:32 +01:00
Andrey Lihatskiy 4b98ae6e8a Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
#	indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
Ansariel 6be5fc07a0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-12 12:21:31 +01:00
Ansariel 508eb80872 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-30 18:45:03 +01:00
Ansariel cfd9c49647 Merge branch 'DRTVWR-587-maint-V' of H:/ViewerDev/viewer-587
# Conflicts:
#	.gitignore
2023-11-30 18:44:01 +01:00
Beq Janus 15530d71f3
alpha goes to test folder 2023-11-25 19:19:11 +00:00
Signal Linden 5416d94d07
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release 2023-11-21 08:07:20 -08:00
Bennett Goble c0ab8b8f0c Switch to viewer-build-util@v1
Switch the build workflow from targeting the `main` branch of
viewer-build-util (which may receive breaking changes) to the stable
`v1` major version tag.
2023-11-20 16:23:05 -08:00
Bennett Goble 9b50c50bf2 Only download release artifacts for release
Only download and publish installers on public releases. This simplifies
the release process, as the flatten_files utility from
viewer-build-utils is not necessary this way. More importantly, it
doesn't clutter public releases with files that shouldn't be published
such as debug symbols.
2023-11-20 08:13:59 -08:00
Beq 1ba1e68e25 Attempt to work around Mac issue with missing package llsd 2023-11-17 01:00:00 +00:00
Nat Goodspeed 96deda3f63 SL-20546: build-variables viewer branch no longer exists. 2023-11-15 09:52:06 -05:00
Nat Goodspeed 819604d2ce SL-20546: Make dependency on build job explicit, not indirect.
The release job has been dependent on sign-and-package-windows and
sign-and-package-mac, each of which depends on build. But that indirect
dependency doesn't convey access to ${{ needs.build.outputs.xxx }}. Add the
build job to direct dependencies so release can access its outputs.
2023-11-15 09:44:38 -05:00
Ansariel c5240ea1d7 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 2023-11-15 11:56:19 +01:00
Nat Goodspeed 6654ad14ee SL-20546: Add PyGithub to installed Python packages. 2023-11-14 14:30:44 -05:00
Nat Goodspeed 59eeaed118 SL-20546: Try harder to infer the branch corresponding to build tag. 2023-11-14 14:20:51 -05:00
Nat Goodspeed 9e99bb04a3 SL-20546: Append generated release notes body to our explicit body.
For a tag build that generates a release page, try to deduce the git branch to
which the tag we're building corresponds and add that to release notes.
2023-11-14 04:09:56 -05:00
Beq d889f9e57b change deployment target 2023-11-11 23:47:33 +00:00
Beq e3e7123f1f Tweak builds to remove 32-bit and add a manual trigger 2023-11-07 20:34:24 +00:00
Beq e346b14b94 quick hack to remove 32 bit builds.
proper refactor of addrsize to follow.
2023-11-07 01:28:03 +00:00
Nat Goodspeed f71662225e SL-20546: Add viewer channel and full version to GitHub release page. 2023-10-31 10:50:39 -04:00
Ansariel 39a6735fc9 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/cmake/APR.cmake
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/viewer_manifest.py
#	indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
Nat Goodspeed e4d6a08941 SL-18837: Build all branches on GitHub now. 2023-10-25 14:39:31 -04:00
Nat Goodspeed 2e8e96cfbc PIE-1057: viewer-build-util's azure branch has been merged to main. 2023-10-18 17:44:07 -04:00
Nat Goodspeed f6d872a027 PIE-1057: Pass sign-pkg-windows@azure the Azure-related secrets. 2023-10-13 15:11:30 -04:00
Nat Goodspeed 549e56572b PIE-1057: Engage viewer-build-util azure branch. 2023-10-12 17:25:30 -04:00
Nat Goodspeed 7648978397 SL-18837: Name the release for the build number to readily find it. 2023-10-05 15:25:54 -04:00
Nat Goodspeed 1684d62499 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.
2023-10-03 19:02:40 -04:00
Nat Goodspeed e2ea42cb6a SL-19242: Expect and pass Apple "Team ID" rather than "ASC Provider".
"ASC Provider" was a credential accepted by altool, but switching from altool
to notarytool requires a Team ID instead.

Expect to find TEAM_ID in our repository secret NOTARIZE_CREDS_MACOS. Extract
it and pass it to sign-pkg-mac.
2023-10-02 16:52:11 -04:00
Brad Linden d2d3599080 Attempt to fix SL-19242 notarize creds secrets loading 2023-09-25 14:02:26 -07:00
Nat Goodspeed 50e3d4020d SL-19242: Reference the actual stored GitHub repo secrets.
Add a Mac signing step to unpack the credentials bundled into
NOTARIZE_CREDS_MACOS so viewer-build-util/sign-pkg-mac need not know about
that peculiarity of our secrets formatting.
2023-09-25 11:19:38 -04:00
Nat Goodspeed e8dfbbaf88 SL-19242: Pass channel and imagename to sign-pkg-mac/action.yaml.
The viewer_manifest.py logic to determine the name of the viewer installer
.dmg is a little convoluted. Make it tell viewer-build-util/sign-pkg-mac that
name, rather than passing it all the relevant inputs and composing it
redundantly.

sign-pkg-mac also wants the viewer channel to determine the application name.
2023-09-20 11:34:56 -04:00
Nat Goodspeed 763fcb02b8 SL-19242: Move comments out of YAML parameter text. 2023-09-19 09:15:30 -04:00
Nat Goodspeed bd8ecbb389 SL-19242: Typo in changing from inline to reusable action. 2023-09-18 22:43:16 -04:00
Nat Goodspeed 1184c383e2 SL-19242: release job now depends on package jobs
and uses new viewer-build-util/release-artifacts action.
2023-09-18 22:39:43 -04:00
Nat Goodspeed 7c351379fc SL-19242: Retrieve and decode Windows signing cert, pass to action. 2023-09-15 15:17:40 -04:00
Nat Goodspeed b02249546e SL-19243: Directly reference action subdirs in viewer-build-util
instead of trying to checkout viewer-build-util (which doesn't work) and then
reference action subdirs from the filesystem.

Also engage (initial placeholder) actions to sign and package the
platform-specific application artifacts.
2023-09-12 16:28:09 -04:00
Nat Goodspeed 3e86f26b40 SL-19243: Try to convince GitHub that ./.util is really a path. 2023-09-12 13:55:08 -04:00
Nat Goodspeed d795b49f16 SL-19243: Job step 'uses' must specify action.yaml file
instead of having it implied by specifying the containing directory.
2023-09-12 12:50:13 -04:00
Nat Goodspeed 0992a0af3b SL-19243: Use consolidated viewer-build-util
instead of distinct viewer-post-bugsplat-{windows,mac} repos.
2023-09-12 12:46:28 -04:00
Nat Goodspeed 29300a1fd3 SL-19242: Try harder to post artifacts containing exactly app image.
In a Windows build tree, we don't actually have an app-named top directory, so
don't package its containing directory -- just the app dir itself, e.g.
"newview/Release".

In a Mac build tree, though we do have "Second Life Mumble.app", its parent
directory also contains other large stuff. Try posting a temp directory
containing a symlink to the .app.

Ditch the "!*.bat" exclusion: the presence of a second path (even an
exclusion) changes how upload-artifact nests its contents.
2023-09-11 10:07:51 -04:00
Nat Goodspeed 63d5d38e36 SL-18837: Stop failing build.sh if there's no installer.
This unblocks ReleaseOS builds, and also preps for SL-19242.

Streamline build.sh's Uploads section.
2023-09-08 17:24:04 -04:00
Nat Goodspeed 2d04cc14d3 SL-19242: Post -app artifact, not -exe, with entire install image.
Previously we posted Windows-exe, macOS-exe artifacts that were a little
inconsistent: Windows-exe contained just the Windows executable, whereas
macOS-exe contained the whole .app tree (but without the .app directory).

Change to post Windows-app, macOS-app artifacts that each contain the whole
viewer install image, including the top-level application name directory. This
is what we'll need to codesign and notarize.
2023-09-08 17:01:46 -04:00
Nat Goodspeed c87d9c635b SL-18837: Suppress ReleaseOS for now. 2023-09-08 14:30:05 -04:00
Nat Goodspeed 77227cf5c4 SL-18837: Suppress BUGSPLAT_DB for ReleaseOS builds. 2023-09-07 14:09:54 -04:00
Nat Goodspeed bac73831c0 SL-18837: String literals are single-quoted in GitHub expressions. 2023-09-07 11:48:15 -04:00