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
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
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
Ansariel