7c3b74a0df
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2024-12-04 16:11:44 +01:00
57338733d0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-12-04 15:15:01 +01:00
3f6d55f4fe
unbreak mac build due to actions/runner-images#10721 ( #3204 )
2024-12-03 16:33:32 -08:00
be7711063b
Bump dawidd6/action-download-artifact from 6 to 7
...
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact ) from 6 to 7.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases )
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-12-01 10:35:04 +00:00
8ed4989c34
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llvoicevivox.cpp
2024-11-07 18:02:38 +01:00
c2c468e890
Bump contributor-assistant to v2.6.1 ( #3000 )
2024-11-06 16:10:18 -08:00
0333b407ee
Fix the tagger logic, hopefully
2024-11-04 01:09:19 +00:00
d78299ecd1
Don't tag arbitrary builds
2024-10-28 17:10:08 +00:00
7a24166706
Update MacOS runners to macos-14 to avoid deprecation brownouts
...
should also fix the homebrew warnings.
2024-10-14 00:48:37 +01:00
92bf4bbcfe
Ensure single binary is submitted for signing.
2024-10-04 13:20:52 +01:00
57f8c6ad18
fix indentation
2024-10-03 23:08:21 +01:00
ab31e68b6c
why can't the second job see the artifacts from the first?
2024-10-03 23:05:21 +01:00
08ba77873e
tweak permissions to hopefully enable artifact access.
2024-10-03 22:28:14 +01:00
03c946d80a
Can't pass folders between jobs, pass as artifacts instead
2024-10-03 21:57:44 +01:00
887a2b87e7
We need to upload the individual files
2024-10-03 21:30:57 +01:00
b1abf5b82e
Fix incorrect output reference
2024-10-03 21:24:30 +01:00
faf4230ffd
make sure the output step is correctly named
2024-10-03 21:14:49 +01:00
70503f79f0
Use compact json form for fromJson compatability
...
also migrate to GITHUB_OUTPUT instead of ::set-output
2024-10-03 17:36:12 +01:00
244d57c889
Let the download do the unzip
2024-10-03 17:19:38 +01:00
e49832c976
Refactored GitHub workflow for artifact signing
...
Use a matrix to effectively iterate over the 4 possible windows artifacts.
extract the signable entity from the original composite artifact
upload it individually ready to be signed.
2024-10-03 17:07:13 +01:00
73a368b6bb
try to get the artifact id
2024-10-02 22:53:42 +01:00
d27f36da20
improve artifact matching
2024-10-02 22:49:24 +01:00
cde423b15f
Don't use deprecated versions...
2024-10-02 22:42:48 +01:00
85dc3ea882
Added manual signing for Windows binaries
...
WiP - A new GitHub workflow has been added to manually sign Windows binaries. This workflow is triggered on a dispatch event and requires the input of a build run number.
2024-10-02 21:14:45 +01:00
d64f98b8e3
More adjustments to handle expanded build matrix
2024-09-29 15:34:05 +01:00
f8cca242f2
cos bash hates me
2024-09-29 00:11:57 +01:00
0c8dc7d1f8
Updated build workflow for avx2
...
Significant changes include:
- Added a new 'variant' matrix in the GitHub Actions workflow, replacing the previous 'addrsize' matrix.
- Introduced support for AVX2 builds with additional flags.
- Modified artifact naming to include the variant type.
- Updated tag-fs-build.yml to reflect changes in tag creation logic.
- Overhauled extract_vars_from_zipfile_name function in download_list.py to handle new filename format and provide more detailed extraction of variables from zip file names.
- Included variant information in gathered build info and updated fs_version_mgr accordingly.
2024-09-29 00:04:56 +01:00
783caacd5f
[build] refactor tagger a little for consistent tagname use
2024-09-26 09:40:05 +01:00
9ccb1ae8ce
downloader can unpack just the json.
...
we could allow it to continue on fail but all future builds will
have the json if they complete.
2024-09-26 01:51:29 +01:00
59f7ef4e5e
[build]missed a fi
2024-09-26 01:42:46 +01:00
22c9e15b23
[build]refactor tagger to trigger on workflow completion
...
still allow manual trigger
extract parameters for tag from the build_info.json artifact
unless they are overridden by the workflow trigger
not entirely sure how to handle 'undefined' inputs
2024-09-26 01:38:46 +01:00
52072ac3f6
[build]Add a json build_info file to the artifacts
2024-09-26 01:34:35 +01:00
091c6575c3
[build] remove redundant workflow step
2024-09-26 00:06:41 +01:00
dfb216c367
[build]correct terminology run_id to run_number and fix usage
2024-09-26 00:03:16 +01:00
f346e830ff
[build] Mac splats - locate the dSYM files
2024-09-25 23:55:38 +01:00
9f5440ab2a
[build] Avoid dependabot nag and add github_token
...
GITHUB_TOKEN environment variable was added to the 'Get run info' step for secure access to GitHub resources.
2024-09-25 22:58:54 +01:00
1be32f31fe
[build] initial commit of fs-build-tagger
2024-09-25 22:34:03 +01:00
7edbaaf40a
[build] Unpack dSYM from xcarchive before upload
2024-09-25 21:54:03 +01:00
8d35ee3029
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-09-17 17:12:45 +02:00
3e8217a24d
Fix the deployment path on the deploy only file upload.
2024-09-16 21:48:48 +01:00
7e2122f436
Need a key to get in.
2024-09-16 19:45:07 +01:00
905857aee0
downloader does not provide the required step output
2024-09-16 18:20:46 +01:00
f9eb2f5789
better parameters to the downloader
2024-09-16 18:07:35 +01:00
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
33dbff8d7c
Massive overhaul of build publishing
...
This will doubtless break horribly.
2024-09-16 02:25:56 +01:00
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
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
3aae77cc6f
Capture the BUGSPLAT_DB and fix Mac executable name
2024-09-06 17:47:00 +01:00
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
240f69f830
correct case for VIEWER_VERSION.txt
2024-09-04 00:44:07 +01:00
96ef422551
Let's just try Linux without the dumpSyms
2024-09-03 22:11:08 +01:00
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
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
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
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
aeb146f269
optimise the file specs. also use beq fork to enable dumpSyms
2024-09-02 15:38:08 +01:00
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
f186f3f1d1
Exploring bugsplat symbol auto-upload.
2024-09-01 22:01:33 +01:00
bddb0fb749
Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer
2024-08-23 11:43:20 +02:00
1adf2d00eb
Fix usage of $branch before it was initialized in build.
2024-08-22 15:46:48 -07:00
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
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
b93529526b
ReleaseOS build fix ( #2299 )
2024-08-15 00:56:39 +03:00
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
2921deed78
Skip windows symbol upload if there was no Release config build. ( #2280 )
2024-08-13 13:42:52 -07:00
23f2631d59
Merge branch 'develop' into nat/edu-channel
2024-08-13 15:32:47 -04:00
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
dc314602d5
Allow triggering an EDU build with a tag containing "edu"
2024-08-13 11:30:41 -04:00
dff3fdbfd7
Adopt NSIS 3.0 ( #2248 )
2024-08-11 16:44:39 -07:00
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
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
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
f4f39e502b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-08-10 11:39:21 +02:00
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
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
d46c444aee
Use the secondlife-3p fork of symbol upload, which has vMAJOR tags
2024-08-08 12:05:16 -07:00
46e5e87315
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-08-08 18:55:33 +02:00
bafc3a31e9
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
2024-08-08 18:54:46 +02:00
cfe84b7f38
Merge branch 'roxie/webrtc-symbols' of github.com:secondlife/viewer into roxie/webrtc-symbols
2024-08-08 09:35:36 -07:00
f1f3aa42e8
CR fixes
2024-08-08 09:34:48 -07:00
83390094f1
test llwebrtc.dll for additional symbols
2024-08-07 22:01:46 -07:00
60003cf077
include viewer exe in uploaded symbols
2024-08-07 19:09:19 -07:00
530bc29753
build debug symbols for llwebrtc even for release
2024-08-07 16:33:00 -07:00
f6f3d7e048
spacing issue
2024-08-07 14:24:00 -07:00
63a4ad9b98
Add Windows multi-pdb upload capability
2024-08-07 14:16:11 -07:00
399eb2104e
viewer#2043 bugsplat symbol upload update
2024-08-07 20:12:59 +03:00
753cf01ef0
don't need to post dylib as we're using xcarchive
2024-08-06 22:24:38 -07:00
fc0e70e77b
upload xcarchive to bugsplat
2024-08-06 21:00:48 -07:00
c52c25e10d
As bugspat upload is broken for dylibs within .dSYM bundles, upload the dylibs directly
2024-08-06 12:06:40 -07:00
70db3e372f
Merge branch 'master' into webrtc_alpha
2024-08-06 11:56:14 +01:00
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
83c1f45dba
Download osx artifacts to working directory
2024-08-06 00:26:43 -07:00
07573f7e10
allow paths with spaces
2024-08-05 23:16:48 -07:00
293187e04b
Build mac symbols for multiple binaries/dynamic libraries and upload them all to bugsplat
2024-08-05 18:17:03 -07:00
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
01688e5216
Use dedicated property to determine if build is called from a fork ( #2183 )
2024-08-02 20:48:06 +03:00
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
dfa7d60a72
build.yaml: Fix FROM_FORK value, ReleaseOS PR builds ( #2147 )
2024-07-30 10:09:49 -07:00
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
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
a247902e3d
build.yaml: Remove unused BUILD variable
2024-07-29 09:52:59 -07:00
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
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
57e78ed43b
viewer#2043 bugsplat symbol upload update
2024-07-23 22:51:31 +03:00
06c90a6fec
Clarify environment info prompt for bug issue template. ( #2088 )
2024-07-23 09:54:19 -07:00
ec4ad10e1a
Use the default compiler version on Linux
2024-07-19 09:51:55 +01:00
cf5bc75d44
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# Conflicts:
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/rlvinventory.cpp
2024-07-18 21:53:13 +02:00
ebc0482bc0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-07-18 20:14:24 +02:00
e5ee898ce5
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/rlvinventory.cpp
2024-07-18 18:50:09 +02:00
0071be5a1a
Tidy up the PR guidance a bit a make it less clunky (hopefully)
2024-07-17 22:09:25 +01:00
29ab0861ae
Add initial version of Pull Request guidelines and template
...
Not sure if this will work or not.
2024-07-17 21:03:16 +01:00
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
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
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
9ab2f662f8
Merge pull request #1819 from secondlife/brad/tag-release
2024-07-01 10:37:21 -07:00
d7c3e112fa
[GHA] Add option to create Tracy builds on workflow triggers
2024-06-24 01:30:04 +01:00
df9e0f7e12
[GHA] See if we can replace 3rd party action with standard checkout
2024-06-24 01:30:04 +01:00
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
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
e33d2fad5f
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
...
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
2024-06-21 19:10:44 +02:00
32b912af9a
Make sure TAG_ID actually gets added to GITHUB_ENV
2024-06-20 17:15:16 -07:00
aa6161ca94
Shorten SHA value used in tag id and attempt to fix js/yaml syntax error
2024-06-20 17:10:00 -07:00
e165be0007
Attempt to use provided GITHUB_TOKEN and generate tag id from inputs
2024-06-18 14:31:41 -07:00
6393e88ca4
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
2024-06-18 11:55:30 -07:00
05efb1494d
Fix yaml indentation of javascript snippet in tag-release workflow
2024-06-17 19:17:18 -07:00
f5659945b5
Fix secret name since GITHUB_ prefix is reserved
2024-06-17 18:54:45 -07:00
3da16d1899
Attempt to fix tag-release workflow by moving conditional secrets usage into env
2024-06-17 18:38:00 -07:00
352dff6830
Attempt to fix workflow syntax in new tag-release workflow ( #1792 )
2024-06-17 18:32:24 -07:00
dd64c39d64
Pass through input channel to select the tag channel name
2024-06-17 17:55:29 -07:00
b9a8b3b240
Update naming and add options to tag-release workflow_dispatch.
2024-06-17 17:43:02 -07:00
84a221e7dd
Renamed tag-nightly.yaml to generalize it to other tags when using workflow_dispatch
2024-06-17 17:41:53 -07:00
0e1e1685d4
Skip the actual tag update step gracefully until we have proper tokens set up
2024-06-13 18:14:21 -07:00
b9f287815a
Add new viewer_channel detection for develop branch
2024-06-13 17:55:05 -07:00
41cb778fb0
Initial work setting up scheduled releases for develop branch.
2024-06-13 17:41:17 -07:00
a2d7d84e0c
Move macos builds to Macos12 ahead of github removing the support.
2024-06-14 00:23:54 +01:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
8565041c2d
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2024-06-12 11:38:14 +02:00
ed34782283
Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-11 18:43:34 -07:00
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
ef9f4b38e9
Merge branch 'main' into DRTVWR-600-maint-A
2024-06-11 17:51:35 +03:00
2e41f5a35e
Try to get sign-and-package-windows job a runner to run on
2024-06-10 16:11:29 -07:00
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
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
c1cf268935
Merge branch 'main' of https://github.com/secondlife/viewer
2024-05-22 19:25:17 +02:00
4b0ad849a9
Merge remote-tracking branch 'LL/project/webrtc-voice'
...
# Conflicts:
# autobuild.xml
# indra/cmake/WebRTC.cmake
2024-05-21 00:42:55 +02:00
3da533c5eb
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
2024-05-20 23:46:53 +02:00
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07:00
191b9395dd
check trigger properly
2024-05-17 12:09:54 +01:00
b094dbed41
Refactor the expiry date code and allow manual trigger
2024-05-17 11:50:44 +01:00
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
8011d3f457
Fix channel detection for mac builds
2024-05-15 16:08:04 -07:00
7feec9998e
Move all release_run logic into setvar job.
2024-05-15 15:12:52 -07:00
0960ae7892
Experiment with getting manually triggered workflow builds to optionally do a release
2024-05-15 14:49:07 -07:00
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
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
18c1458409
Can't reference global env in job.if either.
2024-05-15 16:01:26 -04:00
9d30040dfe
Try to work around workflow YAML env setting limitation.
2024-05-15 15:57:50 -04:00
a4d2574df2
Run ReleaseOS builds, but only when a release page is requested.
2024-05-13 13:46:42 -04:00
f5d4e5f50a
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
2024-05-13 17:29:24 +02:00
c2d3c47bad
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
2024-05-12 16:01:58 +02:00
4f70946048
Fix syntax error in build.yaml to enable Windows ReleaseOS
2024-05-11 10:14:49 -04:00
afd726979a
Turn on GH Windows ReleaseOS build
2024-05-11 09:58:22 -04:00
4af9128db1
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
2024-05-06 16:40:12 -07:00
8d5d9a7e59
Merge branch 'main' of https://github.com/secondlife/viewer
2024-05-03 13:32:06 +02:00
6eeef10cda
Update build.yaml
2024-05-02 10:08:46 -04:00
eb0f963b46
Update build.yaml
2024-05-02 09:48:26 -04:00
7f23f160d7
trim trailing whitespace
2024-05-01 17:51:44 +01:00
65495ba765
set viewer channel from branch
2024-05-01 16:42:09 +01:00
a3602d660c
Merge pull request #1323 from secondlife/main
...
Update from main
2024-04-24 16:02:42 -04:00
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
6ca4dfdb56
Update build.yaml
2024-04-19 16:16:26 -04:00
a65de93541
https://github.com/secondlife/viewer/issues/1286 - branch var from github.repository
2024-04-19 19:51:19 +01:00
f39987f382
https://github.com/secondlife/viewer/issues/1286 - branch var from github.repository
2024-04-19 19:47:46 +01:00
c2730b4fff
https://github.com/secondlife/viewer/issues/1286 - determine viewer_channel from branch name in builds
2024-04-19 16:44:59 +01:00
b340042a3f
https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml
2024-04-16 12:19:09 -04:00
0cf61eed93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
2024-04-16 11:41:43 +02:00
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
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
bc2b88be93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-09 19:46:31 +02:00
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
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
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
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
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
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
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
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
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
104627c67e
Create dependabot.yml for github-actions
2024-04-03 17:10:03 +01:00
9abf29e995
A bunch more changes for notarising.
...
fingers crossed.
2024-04-01 22:45:17 +01:00
45d093f4eb
Update Linux distro to Ubuntu 22.04
2024-03-28 10:22:28 +00:00
cbf6aca2e8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 10:35:43 +01:00
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
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
c810a409e2
Merge GLTF PBR Maint 2 to main.
2024-03-26 16:55:32 -04:00
5e75273b49
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-03-19 17:09:42 +01:00
231062d532
Fix github actions dependency deprecations
2024-03-12 17:49:19 -07:00
091ee67ec5
Merge branch 'main' into DRTVWR-588-maint-W
2024-03-09 19:46:09 +02:00
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
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
Ansariel