6e186befad
Reapply "Merge develop into glTF mesh import"
...
To simplify merging into mesh import branch
This reverts commit b0c951ffe3
2025-07-17 11:23:51 +03:00
a1ab22d153
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-07-16 13:02:01 +02:00
9cc5c07299
New method to handle removing previous viewer
...
Moving previous viewer to trash instead of "removing" it.
2025-07-10 10:36:16 -07:00
db5af314b9
Remove previously installed viewer
...
More permission issues encountered if a job is repeated. That is, when attempting to replace an existing installed viewer.
2025-07-10 10:27:16 -07:00
c70875e0ba
Redirecting viewer installation to Application directory
2025-07-10 08:56:37 -07:00
2f77cd09a9
Remove --no-xattrs option
2025-07-10 08:42:34 -07:00
450d4d77f7
New copy app command
...
An attempt to resolve another permission issue
2025-07-10 08:39:09 -07:00
239a9c7242
Removing previous permission "fix"
2025-07-10 08:18:16 -07:00
8fe51b3c9a
Adjusting dmg mount point
...
Permission issues yet again. Adjusting this back
2025-07-09 14:38:36 -07:00
c8f6eb045d
Remove whitespace
2025-07-09 14:27:46 -07:00
9533232ce7
Mount dmg to new /Volumes
...
Currently hitting another permission error while attempting to mount dmg in tmp
2025-07-09 14:26:09 -07:00
7b4cdd3040
Adjust permission before copying app
2025-07-09 14:14:40 -07:00
8c6e766311
Adjust mac artifact name
...
It was previously looking for a Mac-installer artifact instead of macOS-installer
2025-07-09 13:12:16 -07:00
0bb0d3efea
Add mac runner
...
Uncommenting mac runner lines to enable newly set up self-hosted runner with the workflow.
2025-07-09 08:50:41 -07:00
9c5944f4ce
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-07-07 19:11:59 +02:00
2e1d8c3063
Fix link in pull_request_template.md ( #4329 )
...
Fix the link to CONTRIBUTING.md in the pull request template and simplify some of the checklist item language.
2025-07-02 09:50:23 -07:00
c58caf6b42
Create pull_request_template.md
...
Provide a PR template to expedite both internal and external contributions.
2025-07-02 09:20:59 -07:00
eee837b076
Bump dawidd6/action-download-artifact from 10 to 11
...
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact ) from 10 to 11.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases )
- [Commits](https://github.com/dawidd6/action-download-artifact/compare/v10...v11 )
---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
dependency-version: '11'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2025-07-01 11:53:43 +00:00
b0c951ffe3
Revert "Merge develop into glTF mesh import"
2025-06-27 21:28:58 -04:00
6dd8a02ed1
Merge branch 'project/gltf_mesh_import' into geenz/develop-to-gltf-mesh
2025-06-27 17:18:00 -04:00
781d9fa481
Use latest release for changelog
2025-06-24 01:29:58 +03:00
c4333e2222
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
2025-06-16 12:55:12 +02:00
b7063272ff
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2025-06-16 12:46:50 +02:00
3f4d28329f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-06-15 17:58:08 +02:00
03b6d09ae5
Use windows-latest runner for sign-and-package-windows ( #4263 )
2025-06-12 03:40:20 +03:00
41ef5b2553
Resolve qatest.yaml invalid workflow error
...
Previous edit to allow runners to work independently caused the following error:
The workflow is not valid. .github/workflows/qatest.yaml (Line: 19, Col: 10): Unrecognized named-value: 'matrix'. Located at position 1 within expression: matrix.runner
2025-06-10 11:11:20 -07:00
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
600cef0c8d
Upgrade signing tools
2025-06-08 16:58:51 +01:00
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
11a129f997
Fix typo blindness
2025-06-06 10:56:56 +01:00
cc78d03cc6
CI logging tweak
2025-06-06 03:11:11 +01:00
8dd3955d78
Merge pull request #4140 from secondlife/atlas-qaworkflow
...
Allow self-hosted runners to operate independently
2025-06-05 09:07:42 -07:00
9db37c8cf0
Remove another duplicate in Credits and tweak build
2025-06-04 09:04:26 +01:00
a7fe69cc37
Support potential UA override
2025-06-04 01:09:03 +01:00
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
b2ec5a4b61
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/qatest.yaml
2025-06-01 02:09:15 +02:00
7aea88fb84
Use awk to make PV channel name
2025-05-31 01:40:34 +03:00
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
fe4f85e587
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
2025-05-28 11:52:16 -04:00
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
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
a889740709
Account for further Playwright dependencies in .venv
2025-05-14 14:25:36 -07:00
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
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
147442c240
Adjust install path for new repo name
2025-05-08 06:41:29 -07:00
8c5df1ad9d
Update Windows Build ID step to use pwsh syntax
2025-05-06 12:41:08 -07:00
469730f187
Separate Build ID step for each OS
2025-05-06 12:31:18 -07:00
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
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
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
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
1f3ba13a63
Attempt to fix qatest.yaml CodeQL issues ( #3987 )
2025-04-28 10:51:47 -07:00
85b88f5682
Fix line endings of qatest.yaml
2025-04-18 23:18:32 +03:00
52cca995cc
Merge branch 'release/2025.04' into rye/forevermac
2025-04-15 13:55:01 -04:00
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
5197abfd1f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-04-15 17:54:29 +02:00
d19d44cc72
Merge pull request #3911 from secondlife/main
...
Merge 2025.03 release into develop.
2025-04-15 10:14:27 -04:00
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
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
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
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
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
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
6bdc56c7af
Another attempt at adding rye to the whitelist.
2025-03-11 22:47:38 -04:00
6522975250
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-07 17:19:04 +01:00
6ec93ef403
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-05 10:12:24 +01:00
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
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
941c002877
Merge branch 'develop' into release/2024.12-ForeverFPS
2025-02-19 15:34:58 -05:00
1fe6031a12
CLA wants a comma separated string.
2025-02-19 15:14:50 -05:00
a1121eb8c0
Update allow list for CLA.
2025-02-19 15:00:26 -05:00
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
34c3eed88a
Bump macos runner to os version 15 with xcode 16.1
2025-02-13 17:40:40 +02:00
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
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
26e1520b7f
Backport tag-release token fix to release/2024.12-ForeverFPS branch
2025-01-27 16:18:32 -08:00
d36c7ea161
Improve trusted signing coverage, remove it from nightlies to control costs.
2025-01-24 23:23:47 +00:00
bd9689bea9
Ugh, use pwsh to avoid filesystem escaping silliness
2025-01-23 21:39:10 +00:00
56f2e45bce
Rationalise things and use pwsh or bash env syntax as needed
2025-01-23 20:49:28 +00:00
9bf723d16d
silly typo fix
2025-01-23 16:12:32 +00:00
977d47bb5a
Try a different way to find the latest signtool on github runners
2025-01-23 15:45:01 +00:00
9506ce453b
fix yml a bit
2025-01-23 15:11:49 +00:00
db28566220
Prep for Azure Trusted Signing
2025-01-23 14:42:05 +00:00
a48475d221
both jobs need to be windows
2025-01-22 02:06:24 +00:00
cd8482bd74
Update sign.yml for windows runner
2025-01-22 01:59:36 +00:00
fb25a8cead
update to more recent version of signing action
2025-01-22 01:45:19 +00:00
4e5199761c
apparently the param name changed
2025-01-22 01:38:21 +00:00
42f76f83af
Update sign.yml for azure codesigning tests
2025-01-22 01:30:34 +00:00
b15fb708e3
Merge branch 'main' of https://github.com/secondlife/viewer
2024-12-19 00:00:01 +01:00
bb5fa35900
Roll back to Xcode 14.0.1 to fix secondlife/viewer-private#347 ( #3297 )
2024-12-16 15:41:39 -08:00
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
Andrey Kleshchev