Commit Graph

460 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Ansariel 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
Andrey Lihatskiy ef9f4b38e9 Merge branch 'main' into DRTVWR-600-maint-A 2024-06-11 17:51:35 +03:00
Brad Linden 2e41f5a35e Try to get sign-and-package-windows job a runner to run on 2024-06-10 16:11:29 -07:00
Ansariel 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
Bennett Goble 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
Ansariel c1cf268935 Merge branch 'main' of https://github.com/secondlife/viewer 2024-05-22 19:25:17 +02:00
Ansariel 4b0ad849a9 Merge remote-tracking branch 'LL/project/webrtc-voice'
# Conflicts:
#	autobuild.xml
#	indra/cmake/WebRTC.cmake
2024-05-21 00:42:55 +02:00
Ansariel 3da533c5eb Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	autobuild.xml
2024-05-20 23:46:53 +02:00
Roxie Linden 3a212d9608 Merge branch 'spaces-merge' into roxie/webrtc-voice 2024-05-20 12:59:59 -07:00
Beq 191b9395dd check trigger properly 2024-05-17 12:09:54 +01:00
Beq b094dbed41 Refactor the expiry date code and allow manual trigger 2024-05-17 11:50:44 +01:00
Brad Linden 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
Brad Linden 8011d3f457 Fix channel detection for mac builds 2024-05-15 16:08:04 -07:00
Brad Linden 7feec9998e Move all release_run logic into setvar job. 2024-05-15 15:12:52 -07:00
Brad Linden 0960ae7892 Experiment with getting manually triggered workflow builds to optionally do a release 2024-05-15 14:49:07 -07:00
Nat Goodspeed 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
Nat Goodspeed 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
Nat Goodspeed 18c1458409 Can't reference global env in job.if either. 2024-05-15 16:01:26 -04:00
Nat Goodspeed 9d30040dfe Try to work around workflow YAML env setting limitation. 2024-05-15 15:57:50 -04:00
Nat Goodspeed a4d2574df2 Run ReleaseOS builds, but only when a release page is requested. 2024-05-13 13:46:42 -04:00
Ansariel f5d4e5f50a Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2024-05-13 17:29:24 +02:00
Ansariel c2d3c47bad Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	autobuild.xml
2024-05-12 16:01:58 +02:00
Nat Goodspeed 4f70946048 Fix syntax error in build.yaml to enable Windows ReleaseOS 2024-05-11 10:14:49 -04:00
Nat Goodspeed afd726979a Turn on GH Windows ReleaseOS build 2024-05-11 09:58:22 -04:00
Roxie Linden 4af9128db1 Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice 2024-05-06 16:40:12 -07:00
Ansariel 8d5d9a7e59 Merge branch 'main' of https://github.com/secondlife/viewer 2024-05-03 13:32:06 +02:00
Vir Linden 6eeef10cda
Update build.yaml 2024-05-02 10:08:46 -04:00
Vir Linden eb0f963b46
Update build.yaml 2024-05-02 09:48:26 -04:00
Vir Linden 7f23f160d7 trim trailing whitespace 2024-05-01 17:51:44 +01:00
Vir Linden 65495ba765 set viewer channel from branch 2024-05-01 16:42:09 +01:00
Vir Linden a3602d660c
Merge pull request #1323 from secondlife/main
Update from main
2024-04-24 16:02:42 -04:00
Ansariel 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
Vir Linden 6ca4dfdb56
Update build.yaml 2024-04-19 16:16:26 -04:00
Vir Linden a65de93541 https://github.com/secondlife/viewer/issues/1286 - branch var from github.repository 2024-04-19 19:51:19 +01:00
Vir Linden f39987f382 https://github.com/secondlife/viewer/issues/1286 - branch var from github.repository 2024-04-19 19:47:46 +01:00
Vir Linden c2730b4fff https://github.com/secondlife/viewer/issues/1286 - determine viewer_channel from branch name in builds 2024-04-19 16:44:59 +01:00
Vir Linden b340042a3f
https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml 2024-04-16 12:19:09 -04:00
Ansariel 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
Bennett Goble 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
Bennett Goble 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
Ansariel bc2b88be93 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-09 19:46:31 +02:00
Beq Janus 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
Beq Janus 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
Beq Janus 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
dependabot[bot] 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
Beq Janus 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
dependabot[bot] 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
dependabot[bot] fe3ad7735d
Bump pre-commit/action from 3.0.0 to 3.0.1
Bumps [pre-commit/action](https://github.com/pre-commit/action) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/pre-commit/action/releases)
- [Commits](https://github.com/pre-commit/action/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: pre-commit/action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:11:07 +00:00
dependabot[bot] 347f68c790
Bump actions/labeler from 4 to 5
Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:11:02 +00:00
dependabot[bot] 0fcc9fe246
Bump actions/stale from 6 to 9
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 9.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v9)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-03 16:10:58 +00:00
Beq Janus 104627c67e
Create dependabot.yml for github-actions 2024-04-03 17:10:03 +01:00
Beq 9abf29e995 A bunch more changes for notarising.
fingers crossed.
2024-04-01 22:45:17 +01:00
Beq 45d093f4eb Update Linux distro to Ubuntu 22.04 2024-03-28 10:22:28 +00:00
Ansariel cbf6aca2e8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 10:35:43 +01:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
Ansariel 1f75fbd3b5 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerwindow.cpp
2024-03-26 22:43:42 +01:00
Nat Goodspeed c810a409e2 Merge GLTF PBR Maint 2 to main. 2024-03-26 16:55:32 -04:00
Ansariel 5e75273b49 Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvoicevivox.h
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
2024-03-19 17:09:42 +01:00
Brad Linden 231062d532 Fix github actions dependency deprecations 2024-03-12 17:49:19 -07:00
Andrey Lihatskiy 091ee67ec5 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-09 19:46:09 +02:00
Nat Goodspeed 74ee07d942 To test for presence of secrets, set environment variables.
From https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#using-secrets-in-a-workflow :

"Secrets cannot be directly referenced in if: conditionals. Instead, consider
setting secrets as job-level environment variables, then referencing the
environment variables to conditionally run steps in the job."
2024-03-05 14:23:32 -05:00
Nat Goodspeed 73a12f5529 Enclose 'if:' expressions in ${{ ... }}.
The previous construct produced:

Unrecognized named-value: 'secrets'. Located at position 1 within expression:
secrets.AZURE_KEY_VAULT_URI && ...
2024-03-05 13:50:38 -05:00
Nat Goodspeed 6328cb7817 Make signing and symbol posting jobs conditional on secrets.
Specifically, when secrets aren't available (e.g. for external PRs), skip the
affected steps.
2024-03-05 13:36:18 -05:00
Signal Linden e07bf1c0a2
Do not automatically close issues (#929)
Mark issues as stale but do not close them.
2024-03-04 17:32:35 -08:00
Ansariel 2827ebf04f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 22:47:21 +01:00
Nat Goodspeed 9b8800f216 Now that viewer-build-util@relnotes has merged to v1, use @v1. 2024-03-01 16:43:15 -05:00
Nat Goodspeed 00d7fef75e Reference updated action-gh-release@v1
instead of the branch that got pulled.

(cherry picked from commit b42e01d7ac)
2024-03-01 16:19:02 -05:00
Nat Goodspeed 3ee3e011ff Base generated release notes on new floating tag 'release'
instead of on the current tag 7.1.2-release.

(cherry picked from commit 27b298d8bc)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 7ad13c8511 Leverage action-gh-release's new previous_tag input.
This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.

(cherry picked from commit 88ebb92f05)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 7c52db381c Try basing release notes on github.sha rather than github.ref_name.
(cherry picked from commit 4edd78f2e5)
2024-03-01 16:19:01 -05:00
Nat Goodspeed d7e6a7dbd0 Try basing the GH release on github.ref_name instead of github.ref.
Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]

(cherry picked from commit c6a6db8488)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 603d3a865a Try to generate release notes for this specific branch.
Also try to cross-reference release page and build page.

(cherry picked from commit a908b4cfa9)
2024-03-01 16:19:01 -05:00
Nat Goodspeed 9f326f5b96 Engage new viewer-build-util/which-branch with relnotes output.
Put whatever release notes we retrieve into the generated release page.

(cherry picked from commit ff543b744e)
2024-03-01 16:19:01 -05:00
Nat Goodspeed a8cd70123b SL-20546: PyGithub was only needed for local which_branch.py.
Now that which_branch.py has moved to viewer-build-util, so has the PyGithub
dependency.

(cherry picked from commit dd0ec112fe)
2024-03-01 16:13:29 -05:00
Nat Goodspeed 8f68199ccd SL-20546: Use branch for autobuild package as well as release page.
which_branch.py has moved to viewer-build-util as a reusable action.

(cherry picked from commit 09f66828ba)
2024-03-01 16:13:29 -05:00
Nat Goodspeed 9b3d4325d9 DRTVWR-601: Use viewer-build-util/which-branch to determine branch.
(cherry picked from commit 2c5066f1fc)
(cherry picked from commit ff1741ceca)
2024-03-01 16:13:29 -05:00
Nat Goodspeed 8590ce0533 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.

(cherry picked from commit b782ab73e6)
(cherry picked from commit 6e8d4f4846)
2024-03-01 16:13:29 -05:00
Nat Goodspeed cfbef4e4f9 SL-20546: Make dependency on build job explicit, not indirect.
The release job has been dependent on sign-and-package-windows and
sign-and-package-mac, each of which depends on build. But that indirect
dependency doesn't convey access to ${{ needs.build.outputs.xxx }}. Add the
build job to direct dependencies so release can access its outputs.

(cherry picked from commit 819604d2ce)
2024-03-01 16:13:29 -05:00
Nat Goodspeed e4865db0ca SL-20546: Add PyGithub to installed Python packages.
(cherry picked from commit 6654ad14ee)
2024-03-01 16:13:29 -05:00
Nat Goodspeed a13e70aeff SL-20546: Try harder to infer the branch corresponding to build tag.
(cherry picked from commit 59eeaed118)
2024-03-01 16:13:29 -05:00
Nat Goodspeed cac7023996 SL-20546: Append generated release notes body to our explicit body.
For a tag build that generates a release page, try to deduce the git branch to
which the tag we're building corresponds and add that to release notes.

(cherry picked from commit 9e99bb04a3)
2024-03-01 16:13:29 -05:00
Nat Goodspeed e0ae227d0a SL-20546: Add viewer channel and full version to GitHub release page.
(cherry picked from commit f71662225e)
2024-03-01 16:13:28 -05:00
Ansariel c63b3eca4c Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llurlregistry.cpp
#	indra/newview/llcontrolavatar.cpp
2024-03-01 21:00:56 +01:00
Ansariel 203ac04bf6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_stats.xml
2024-03-01 20:49:42 +01:00
Ansariel cb43d15c23 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	README.md
2024-03-01 20:07:23 +01:00
Ansariel e13ab75b9b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 20:05:51 +01:00
Nat Goodspeed b242d696ba Merge branch 'main' of github.com:secondlife/viewer
on promotion of DRTVWR-489 Emoji viewer.
2024-03-01 11:15:53 -05:00
Nat Goodspeed 1204468415 Merge DRTVWR-489 to main on promotion of Emoji viewer (#673). 2024-03-01 10:23:56 -05:00
Nat Goodspeed b42e01d7ac Reference updated action-gh-release@v1
instead of the branch that got pulled.
2024-02-28 08:45:12 -05:00
Nat Goodspeed 27b298d8bc Base generated release notes on new floating tag 'release'
instead of on the current tag 7.1.2-release.
2024-02-26 17:05:56 -05:00
Nat Goodspeed 88ebb92f05 Leverage action-gh-release's new previous_tag input.
This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.
2024-02-26 15:51:31 -05:00
Nat Goodspeed 4edd78f2e5 Try basing release notes on github.sha rather than github.ref_name. 2024-02-26 13:26:29 -05:00
Nat Goodspeed c6a6db8488 Try basing the GH release on github.ref_name instead of github.ref.
Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]
2024-02-26 12:20:31 -05:00
Nat Goodspeed a908b4cfa9 Try to generate release notes for this specific branch.
Also try to cross-reference release page and build page.
2024-02-26 11:23:47 -05:00
Andrey Lihatskiy ae6aa3fc41
Merge branch 'main' into DRTVWR-588-maint-W 2024-02-23 19:16:08 +02:00
Brad Linden 0f2248ea12
Improving issue templates. (#877)
making ordering explicit, and disabling blank issue submission to force
triage label to be set.
2024-02-22 13:01:49 -08:00
Vir Linden ffef19843b
Delete .github/ISSUE_TEMPLATE/issue_template.md 2024-02-22 11:28:44 -05:00
Vir Linden b9ac5e8433
Update issue_template.md 2024-02-22 11:26:54 -05:00
Vir Linden e452eeb816
Update issue_template.md 2024-02-22 11:24:55 -05:00
Vir Linden 4b24b0d933
Create issue_template.md
Issue template for the "blank issue" option
2024-02-22 10:28:10 -05:00
Andrey Lihatskiy 6ae83f06d8
Merge branch 'main' into DRTVWR-588-maint-W 2024-02-21 22:01:44 +02:00
Beq d5e1b538d7 Update imported actions to remove deprecated JS dependency 2024-02-15 20:03:42 +00:00
Nat Goodspeed ff543b744e Engage new viewer-build-util/which-branch with relnotes output.
Put whatever release notes we retrieve into the generated release page.
2024-02-15 11:21:31 -05:00
Brad Linden 255bb8504d
Update cla.yaml allowlist to clear spurious errors (#804) 2024-02-14 09:54:46 -08:00
Ansariel dd3b29d82c Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2024-02-14 18:05:08 +01:00
Brad Linden bf2fb55fe7 Update cla.yaml allowlist to clear spurious errors 2024-02-14 17:17:58 +02:00
Beq 40a64ed70c Make windows testbuilds expire properly
hint: don't use bash style variable setting in powershell
2024-02-12 22:26:45 +00:00
Ansariel 86230977c4 Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
# Conflicts:
#	README.md
2024-02-11 19:46:50 +01:00
Nat Goodspeed 19b808316b Merge branch 'main' of github.com:secondlife/viewer 2024-02-09 13:31:30 -05:00
Signal Linden 9b51fee9bc
Rename config.yaml to config.yml
Issue template configuration is the only github configuration file I've found which does not support both `*.yaml` and `*.yml` extensions. Drat.
2024-02-07 13:24:35 -08:00
Brad Linden 23d44cb665 Merge remote-tracking branch 'origin/main' into release/gltf-maint2 2024-02-07 13:09:35 -08:00
Signal Linden 95f213115b
Add link to feedback portal
Provide a link to feedback.secondlife.com from the issue creation page.
2024-02-05 16:09:54 -08:00
Bennett Goble 27e3fdc957 build.yaml: Build shared branches
We're currently building every single commit pushed to Github. This is
racking up $20k in build charges a month and is generally superfluous.

This changeset alters build triggers so that builds automatically run if
they are committed to a **shared branch**:

- `release/*` - A release stabilization branch
- `project/*` - A project viewer branch
- `main/*` - The default/stable branch

PR commits are also automatically built.

...need to build another commit? Developers can trigger one using a
manual workflow run.
2024-01-31 13:26:14 -08:00
Andrey Lihatskiy 71d0e6f400
Merge branch 'main' into DRTVWR-588-maint-W 2024-01-31 20:12:03 +02:00
Vir Linden c0861e9366
Merge pull request #692 from secondlife/vir-linden-issue-templates-1
Update enhancement.md
2024-01-30 09:35:03 -05:00
Andrey Lihatskiy 9f0a5a3385 Merge branch 'main' into DRTVWR-588-maint-W 2024-01-29 22:18:23 +02:00
Vir Linden 00962fd397
Update enhancement.md 2024-01-29 12:42:28 -05:00
Vir Linden a9158943a8
Update bug.yaml 2024-01-29 12:38:11 -05:00
Ansariel 04d32cf7eb Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llviewermenu.cpp
#	indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
#	indra/newview/skins/default/xui/en/floater_world_map.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/en/panel_profile_pick.xml
#	indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2024-01-26 14:29:44 +01:00
RunitaiLinden cb14e9a074
Create enhancement.md 2024-01-24 12:32:10 -06:00
RunitaiLinden bc4bf9e207
Create bug.yaml 2024-01-24 12:30:45 -06:00
Ansariel fa05f94eae Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
2024-01-23 12:23:54 +01:00
Nat Goodspeed 6555fb3409 SL-20546: Use viewer-build-util@v1 instead of PR branch.
The fix we wanted was on the pr-branch branch of the viewer-build-util repo.
Now that it's been published as v1.1.2, the updated v1 tag references the fix,
so revert mention to @v1.
2024-01-18 21:35:48 -05:00
Nat Goodspeed 834cc3d1e0 SL-20546: Test new viewer-build-util branch pr-branch. 2024-01-18 15:21:15 -05:00
Nat Goodspeed dd0ec112fe SL-20546: PyGithub was only needed for local which_branch.py.
Now that which_branch.py has moved to viewer-build-util, so has the PyGithub
dependency.
2024-01-18 13:43:34 -05:00
Nat Goodspeed 09f66828ba SL-20546: Use branch for autobuild package as well as release page.
which_branch.py has moved to viewer-build-util as a reusable action.
2024-01-18 13:34:40 -05:00
Nat Goodspeed ff1741ceca DRTVWR-601: Use viewer-build-util/which-branch to determine branch.
(cherry picked from commit 2c5066f1fc)
2024-01-18 13:29:39 -05:00
Nat Goodspeed 6e8d4f4846 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.

(cherry picked from commit b782ab73e6)
2024-01-18 13:29:39 -05:00
Nat Goodspeed fea1d9f4d2 SL-20546: Merge branch 'DRTVWR-588-maint-W' into sl-20546. 2024-01-18 13:15:32 -05:00
Nat Goodspeed e2ba2f9c45 Move "team:viewer" label action to labeler.yaml.
This avoids the need for a separate job step.
2024-01-12 17:26:46 -05:00
Nat Goodspeed 0730681b8a Fold PR labeling into existing label.yaml. 2024-01-12 17:26:46 -05:00
Nat Goodspeed 36fff90f90 Grant write permission for pull requests. 2024-01-12 17:26:46 -05:00
Nat Goodspeed f5d6af9cfc Add a workflow to auto-label new PRs with team:viewer.
When a PR appears on the QA board, QA wants to know whose team it came from.
So every PR on the viewer repo should be labeled with team:viewer.
2024-01-12 17:26:46 -05:00
Ansariel 3bd76c0fea Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llfasttimerview.cpp
#	indra/newview/skins/default/xui/en/widgets/color_swatch.xml
#	indra/newview/skins/default/xui/en/widgets/texture_picker.xml
2024-01-09 09:37:38 +01:00
Beq 99851ed459 disable viewer_version extraction rule for now 2023-12-29 14:41:12 +00:00
Beq 5aa47877a2 Export python binary in ENV to satisfy CMake
Use env var to force the python version
set python for Cmake and remove python cache
2023-12-29 02:35:34 +00:00
Beq 549e7ff3c1 ensure python & python3 have the same requirements set 2023-12-29 02:34:56 +00:00
Beq 5198af498a switch windows python back to defaults 2023-12-29 02:34:35 +00:00
Beq b6d55cc43b quick patch - not a fix, these will not run
clean up variable declarations and prep for bugsplat sym upload

bash variables hate whitespace
2023-12-29 02:34:09 +00:00
Beq 7db1a5ce49 fail means fail 2023-12-27 19:12:38 +00:00
Nat Goodspeed 2c5066f1fc DRTVWR-601: Use viewer-build-util/which-branch to determine branch. 2023-12-18 17:35:23 -05:00
Nat Goodspeed b782ab73e6 DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.
2023-12-18 10:59:03 -05:00
Ansariel 783e488a63 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llspatialpartition.cpp
2023-12-15 22:48:56 +01:00
Ansariel e3c2f12d53 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	indra/newview/skins/default/xui/da/panel_main_inventory.xml
#	indra/newview/skins/default/xui/pt/panel_main_inventory.xml
#	indra/newview/skins/default/xui/tr/panel_main_inventory.xml
#	indra/newview/skins/default/xui/zh/panel_main_inventory.xml
2023-12-15 18:25:32 +01:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
Andrey Lihatskiy 4b98ae6e8a Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
#	indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
Ansariel 6be5fc07a0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-12 12:21:31 +01:00
Alexander Gavriliuk eff5958c11 Fix formatting in autobuild.xml (indents in close tags) 2023-12-05 20:37:21 +01:00
Alexander Gavriliuk c9cd5631e4 Merge branch 'main' into DRTVWR-489 2023-12-05 03:37:06 +01:00
Ansariel 2351a0eeb6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	.github/release.yaml
2023-12-02 19:11:18 +01:00