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