47dbce2fa9
Move to Ubuntu 24.04 runner
2025-08-09 19:08:58 +01:00
c14d0d50b1
Update macOS version for build matrix
...
macos-14 to macos-15 aligns with LL
2025-08-09 15:24:42 +01:00
d7c73b9364
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-09 02:24:24 +02:00
c1450afe6e
Bump azure/trusted-signing-action from 0.5.1 to 0.5.9
...
Bumps [azure/trusted-signing-action](https://github.com/azure/trusted-signing-action ) from 0.5.1 to 0.5.9.
- [Release notes](https://github.com/azure/trusted-signing-action/releases )
- [Commits](https://github.com/azure/trusted-signing-action/compare/v0.5.1...v0.5.9 )
---
updated-dependencies:
- dependency-name: azure/trusted-signing-action
dependency-version: 0.5.9
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2025-08-01 11:01:50 +00:00
bfd99549b0
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# indra/llappearance/lltexlayer.cpp
# indra/llcommon/llthread.cpp
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/lldaeloader.h
# indra/llprimitive/llmodel.cpp
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llmodelpreview.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
a1ab22d153
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-07-16 13:02:01 +02:00
9c5944f4ce
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-07-07 19:11:59 +02: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
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
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
Beq