Commit Graph

581 Commits (master)

Author SHA1 Message Date
Signal Linden 3c7dde56e5
Require PR descriptions (#4233)
* Require PR descriptions

Add a simple workflow check to ensure PRs have a description.

* Potential fix for code scanning alert no. 32: Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-06-10 09:21:49 -07:00
Beq 600cef0c8d Upgrade signing tools 2025-06-08 16:58:51 +01:00
Ansariel 4cfdea8395 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/zh/strings.xml
2025-06-07 17:50:44 +02:00
Beq 11a129f997 Fix typo blindness 2025-06-06 10:56:56 +01:00
Beq cc78d03cc6 CI logging tweak 2025-06-06 03:11:11 +01:00
AtlasLinden 8dd3955d78
Merge pull request #4140 from secondlife/atlas-qaworkflow
Allow self-hosted runners to operate independently
2025-06-05 09:07:42 -07:00
Beq 9db37c8cf0 Remove another duplicate in Credits and tweak build 2025-06-04 09:04:26 +01:00
Beq a7fe69cc37 Support potential UA override 2025-06-04 01:09:03 +01:00
dependabot[bot] bbf95df450
Bump dawidd6/action-download-artifact from 9 to 10
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 9 to 10.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v9...v10)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-version: '10'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-01 10:10:32 +00:00
Ansariel b2ec5a4b61 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/qatest.yaml
2025-06-01 02:09:15 +02:00
Andrey Lihatskiy 7aea88fb84 Use awk to make PV channel name 2025-05-31 01:40:34 +03:00
Ansariel 159c05a5ac Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/newview/skins/default/xui/ja/strings.xml
2025-05-30 13:26:29 +02:00
Jonathan "Geenz" Goodman fe4f85e587 Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop 2025-05-28 11:52:16 -04:00
Ansariel 355a80ab91 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llfloaterworldmap.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/floater_world_map.xml
2025-05-23 13:13:24 +02:00
AtlasLinden cee546977d
Allow runners to operate independently
Currently if there are multiple workflow runs queued and a runner is offline, the online runner will wait for the offline runner to either timeout or complete the job before moving to the next job.
This adjustment should allow the online runner/s to move onto new workflow runs regardless of what other runners are up to.
2025-05-22 09:05:24 -07:00
AtlasLinden a889740709
Account for further Playwright dependencies in .venv 2025-05-14 14:25:36 -07:00
AtlasLinden 33fb7903f9
Added "verify repo is up-to-date" step
Local changes are stashed temporarily upon repo update and an attempt to restore them is made afterwards. If a merge conflict is hit then a new local branch is created.
2025-05-14 08:32:25 -07:00
AtlasLinden ca81b40f5a
Add virtual env setup step to qatest.yaml
A step is created for both Win and Mac
2025-05-14 07:33:58 -07:00
AtlasLinden 147442c240
Adjust install path for new repo name 2025-05-08 06:41:29 -07:00
AtlasLinden 8c5df1ad9d
Update Windows Build ID step to use pwsh syntax 2025-05-06 12:41:08 -07:00
AtlasLinden 469730f187
Separate Build ID step for each OS 2025-05-06 12:31:18 -07:00
AtlasLinden 2c176c75fc
Resolve qatest.yaml concurrency group error
Error: "The workflow is not valid. .github/workflows/qatest.yaml (Line: 23, Col: 10): Unrecognized named-value: 'matrix'. Located at position 1 within expression: matrix.runner"
2025-05-06 11:02:57 -07:00
AtlasLinden 4bb51a5f27
Add permissions to QA Workflow
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-05-06 06:28:57 -07:00
AtlasLinden f68a5b2363
Introduce workflow dispatch and mac functionality to qatest.yaml
A workflow dispatch has been added in an attempt to not only manually trigger this workflow but to also test this from a different branch without having to first merge to develop.

Also steps have been added to allow this workflow to run on mac runners when added. Mac runner info currently commented out.
2025-05-05 15:08:10 -07:00
Ansariel 3d61db550d Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/newview/skins/default/xui/en/notifications.xml
2025-05-03 13:26:46 +02:00
Brad Linden 1f3ba13a63
Attempt to fix qatest.yaml CodeQL issues (#3987) 2025-04-28 10:51:47 -07:00
Ansariel 85b88f5682 Fix line endings of qatest.yaml 2025-04-18 23:18:32 +03:00
Jonathan "Geenz" Goodman 52cca995cc Merge branch 'release/2025.04' into rye/forevermac 2025-04-15 13:55:01 -04:00
Ansariel cdf8eda7d0 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
2025-04-15 18:03:59 +02:00
Ansariel 5197abfd1f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-04-15 17:54:29 +02:00
Jonathan "Geenz" Goodman d19d44cc72
Merge pull request #3911 from secondlife/main
Merge 2025.03 release into develop.
2025-04-15 10:14:27 -04:00
Ansariel 1537c9ed2c Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llmessage/message_prehash.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/en/strings.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/pl/strings.xml
#	indra/newview/skins/default/xui/pt/strings.xml
2025-03-28 15:07:17 +01:00
AtlasLinden 0a39fe8dc9
Allow QA workflow to run on Second_Life_X branches
Using the echos from the last run, it appears that the tagged builds have Workflow Head Branch = Second_Life_X. 
Edit made so the file looks for this rather than what was there previously.
2025-03-27 15:28:15 -07:00
AtlasLinden 51f5b85360
Removed unnecessary comments in QA workflow file
GHA does not like comments inside an if statement. These have been removed.
2025-03-27 06:58:07 -07:00
AtlasLinden 1e2d4d3018
Added QA workflow file
Previously in the develop archive.
Recent change is to only run the workflow for tagged builds. The code to running other builds has been commented out.
2025-03-26 14:41:44 -07:00
Ansariel 62e5fffd8e Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/skins/default/colors.xml
2025-03-23 12:29:33 +01:00
Jonathan "Geenz" Goodman 3c96bd2c69
Switch to smaller runners (#3722)
* Switch to smaller runners

* Make the runner conditional based upon a specific tag.

Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
2025-03-21 05:54:08 -04:00
Jonathan "Geenz" Goodman 6bdc56c7af Another attempt at adding rye to the whitelist. 2025-03-11 22:47:38 -04:00
Ansariel 6522975250 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-03-07 17:19:04 +01:00
Ansariel 6ec93ef403 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-03-05 10:12:24 +01:00
dependabot[bot] fac553388a
Bump dawidd6/action-download-artifact from 8 to 9
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 8 to 9.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v8...v9)

---
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>
2025-03-01 10:11:36 +00:00
Ansariel e518cba882 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llfontfreetype.h
2025-02-26 10:04:47 +01:00
Jonathan "Geenz" Goodman 941c002877 Merge branch 'develop' into release/2024.12-ForeverFPS 2025-02-19 15:34:58 -05:00
Jonathan "Geenz" Goodman 1fe6031a12 CLA wants a comma separated string. 2025-02-19 15:14:50 -05:00
Jonathan "Geenz" Goodman a1121eb8c0 Update allow list for CLA. 2025-02-19 15:00:26 -05:00
Ansariel 5bf1f485f3 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
2025-02-13 21:24:29 +01:00
Andrey Lihatskiy 34c3eed88a Bump macos runner to os version 15 with xcode 16.1 2025-02-13 17:40:40 +02:00
Ansariel dac7725c40 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_setup.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
2025-02-03 16:11:21 +01:00
dependabot[bot] af69dcd18a
Bump dawidd6/action-download-artifact from 7 to 8
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 7 to 8.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v7...v8)

---
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>
2025-02-01 10:25:58 +00:00
Brad Linden 26e1520b7f Backport tag-release token fix to release/2024.12-ForeverFPS branch 2025-01-27 16:18:32 -08:00
Beq d36c7ea161 Improve trusted signing coverage, remove it from nightlies to control costs. 2025-01-24 23:23:47 +00:00
Beq bd9689bea9 Ugh, use pwsh to avoid filesystem escaping silliness 2025-01-23 21:39:10 +00:00
Beq 56f2e45bce Rationalise things and use pwsh or bash env syntax as needed 2025-01-23 20:49:28 +00:00
Beq 9bf723d16d silly typo fix 2025-01-23 16:12:32 +00:00
Beq 977d47bb5a Try a different way to find the latest signtool on github runners 2025-01-23 15:45:01 +00:00
Beq 9506ce453b fix yml a bit 2025-01-23 15:11:49 +00:00
Beq db28566220 Prep for Azure Trusted Signing 2025-01-23 14:42:05 +00:00
Beq Janus a48475d221
both jobs need to be windows 2025-01-22 02:06:24 +00:00
Beq Janus cd8482bd74
Update sign.yml for windows runner 2025-01-22 01:59:36 +00:00
Beq Janus fb25a8cead
update to more recent version of signing action 2025-01-22 01:45:19 +00:00
Beq Janus 4e5199761c
apparently the param name changed 2025-01-22 01:38:21 +00:00
Beq Janus 42f76f83af
Update sign.yml for azure codesigning tests 2025-01-22 01:30:34 +00:00
Ansariel b15fb708e3 Merge branch 'main' of https://github.com/secondlife/viewer 2024-12-19 00:00:01 +01:00
Brad Linden bb5fa35900
Roll back to Xcode 14.0.1 to fix secondlife/viewer-private#347 (#3297) 2024-12-16 15:41:39 -08:00
Ansariel 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
Ansariel 57338733d0 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-12-04 15:15:01 +01:00
Brad Linden 3f6d55f4fe
unbreak mac build due to actions/runner-images#10721 (#3204) 2024-12-03 16:33:32 -08:00
dependabot[bot] 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
Ansariel 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
Andrey Lihatskiy c2c468e890 Bump contributor-assistant to v2.6.1 (#3000) 2024-11-06 16:10:18 -08:00
Beq 0333b407ee Fix the tagger logic, hopefully 2024-11-04 01:09:19 +00:00
Beq d78299ecd1 Don't tag arbitrary builds 2024-10-28 17:10:08 +00:00
Beq 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
Beq 92bf4bbcfe Ensure single binary is submitted for signing. 2024-10-04 13:20:52 +01:00
Beq 57f8c6ad18 fix indentation 2024-10-03 23:08:21 +01:00
Beq ab31e68b6c why can't the second job see the artifacts from the first? 2024-10-03 23:05:21 +01:00
Beq 08ba77873e tweak permissions to hopefully enable artifact access. 2024-10-03 22:28:14 +01:00
Beq 03c946d80a Can't pass folders between jobs, pass as artifacts instead 2024-10-03 21:57:44 +01:00
Beq 887a2b87e7 We need to upload the individual files 2024-10-03 21:30:57 +01:00
Beq b1abf5b82e Fix incorrect output reference 2024-10-03 21:24:30 +01:00
Beq faf4230ffd make sure the output step is correctly named 2024-10-03 21:14:49 +01:00
Beq 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
Beq 244d57c889 Let the download do the unzip 2024-10-03 17:19:38 +01:00
Beq 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
Beq 73a368b6bb try to get the artifact id 2024-10-02 22:53:42 +01:00
Beq d27f36da20 improve artifact matching 2024-10-02 22:49:24 +01:00
Beq cde423b15f Don't use deprecated versions... 2024-10-02 22:42:48 +01:00
Beq 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
Beq d64f98b8e3 More adjustments to handle expanded build matrix 2024-09-29 15:34:05 +01:00
Beq f8cca242f2 cos bash hates me 2024-09-29 00:11:57 +01:00
Beq 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
Beq 783caacd5f [build] refactor tagger a little for consistent tagname use 2024-09-26 09:40:05 +01:00
Beq 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
Beq 59f7ef4e5e [build]missed a fi 2024-09-26 01:42:46 +01:00
Beq 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
Beq 52072ac3f6 [build]Add a json build_info file to the artifacts 2024-09-26 01:34:35 +01:00
Beq 091c6575c3 [build] remove redundant workflow step 2024-09-26 00:06:41 +01:00
Beq dfb216c367 [build]correct terminology run_id to run_number and fix usage 2024-09-26 00:03:16 +01:00
Beq f346e830ff [build] Mac splats - locate the dSYM files 2024-09-25 23:55:38 +01:00
Beq 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
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