Commit Graph

460 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
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
Beq 190b76aaf9 be gone release.yaml 2023-12-02 16:10:20 +00:00
Ansariel 50c7296d34 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +01:00
Ansariel 508eb80872 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-30 18:45:03 +01:00
Ansariel cfd9c49647 Merge branch 'DRTVWR-587-maint-V' of H:/ViewerDev/viewer-587
# Conflicts:
#	.gitignore
2023-11-30 18:44:01 +01:00
Beq Janus 15530d71f3
alpha goes to test folder 2023-11-25 19:19:11 +00:00
Signal Linden 5416d94d07
Merge branch 'DRTVWR-587-maint-V' into signal/simple-release 2023-11-21 08:07:20 -08:00
Bennett Goble c0ab8b8f0c Switch to viewer-build-util@v1
Switch the build workflow from targeting the `main` branch of
viewer-build-util (which may receive breaking changes) to the stable
`v1` major version tag.
2023-11-20 16:23:05 -08:00
Bennett Goble 9b50c50bf2 Only download release artifacts for release
Only download and publish installers on public releases. This simplifies
the release process, as the flatten_files utility from
viewer-build-utils is not necessary this way. More importantly, it
doesn't clutter public releases with files that shouldn't be published
such as debug symbols.
2023-11-20 08:13:59 -08:00
Ansariel be71515833 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-20 13:05:09 +01:00
Beq 1ba1e68e25 Attempt to work around Mac issue with missing package llsd 2023-11-17 01:00:00 +00:00
Nat Goodspeed 96deda3f63 SL-20546: build-variables viewer branch no longer exists. 2023-11-15 09:52:06 -05:00
Nat Goodspeed 819604d2ce 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.
2023-11-15 09:44:38 -05:00
Ansariel c5240ea1d7 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 2023-11-15 11:56:19 +01:00
Ansariel c1813cc64a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/lldrawable.cpp
2023-11-15 11:55:55 +01:00
Nat Goodspeed 6654ad14ee SL-20546: Add PyGithub to installed Python packages. 2023-11-14 14:30:44 -05:00
Nat Goodspeed 59eeaed118 SL-20546: Try harder to infer the branch corresponding to build tag. 2023-11-14 14:20:51 -05:00
Nat Goodspeed 9e99bb04a3 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.
2023-11-14 04:09:56 -05:00
Beq d889f9e57b change deployment target 2023-11-11 23:47:33 +00:00
Beq e3e7123f1f Tweak builds to remove 32-bit and add a manual trigger 2023-11-07 20:34:24 +00:00
Ansariel aa847c1bac Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-07 10:23:48 +01:00
Beq e346b14b94 quick hack to remove 32 bit builds.
proper refactor of addrsize to follow.
2023-11-07 01:28:03 +00:00
Nat Goodspeed f71662225e SL-20546: Add viewer channel and full version to GitHub release page. 2023-10-31 10:50:39 -04:00
Ansariel 70db255e02 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	.github/workflows/build.yaml
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llcommon/tests/workqueue_test.cpp
#	indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
Ansariel f6134cdd00 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
#	autobuild.xml
2023-10-27 11:33:06 +02:00
Brad Linden 0fe058f9b8 Fix build.yaml line that got dropped in the merge. 2023-10-26 10:37:19 -07:00
Ansariel 39a6735fc9 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/cmake/APR.cmake
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/viewer_manifest.py
#	indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
Brad Linden 673b3309dd Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-10-25 16:12:13 -07:00
Nat Goodspeed e4d6a08941 SL-18837: Build all branches on GitHub now. 2023-10-25 14:39:31 -04:00
Nat Goodspeed 2e8e96cfbc PIE-1057: viewer-build-util's azure branch has been merged to main. 2023-10-18 17:44:07 -04:00
Nat Goodspeed f6d872a027 PIE-1057: Pass sign-pkg-windows@azure the Azure-related secrets. 2023-10-13 15:11:30 -04:00
Nat Goodspeed 549e56572b PIE-1057: Engage viewer-build-util azure branch. 2023-10-12 17:25:30 -04:00
Nat Goodspeed 7648978397 SL-18837: Name the release for the build number to readily find it. 2023-10-05 15:25:54 -04:00
Nat Goodspeed 1684d62499 SL-19242: Remove signing and packaging from viewer_manifest.py
for Mac and Windows. That's now done by subsequent jobs in the GitHub build.
Remove workflow step to upload installers before signing and packaging jobs.

Remove from viewer_manifest.py conditionals for 32-bit Windows or Mac.

Also bump to actions/checkout@v4, per dependabot.
2023-10-03 19:02:40 -04:00
Nat Goodspeed e2ea42cb6a SL-19242: Expect and pass Apple "Team ID" rather than "ASC Provider".
"ASC Provider" was a credential accepted by altool, but switching from altool
to notarytool requires a Team ID instead.

Expect to find TEAM_ID in our repository secret NOTARIZE_CREDS_MACOS. Extract
it and pass it to sign-pkg-mac.
2023-10-02 16:52:11 -04:00
Brad Linden d2d3599080 Attempt to fix SL-19242 notarize creds secrets loading 2023-09-25 14:02:26 -07:00
Nat Goodspeed 50e3d4020d SL-19242: Reference the actual stored GitHub repo secrets.
Add a Mac signing step to unpack the credentials bundled into
NOTARIZE_CREDS_MACOS so viewer-build-util/sign-pkg-mac need not know about
that peculiarity of our secrets formatting.
2023-09-25 11:19:38 -04:00
Ansariel 0514918bed Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	scripts/messages/message_template.msg.sha1
2023-09-21 18:34:10 +02:00
Brad Linden bb7f023aaa Remove win32 build from DRTVWR-559 github build 2023-09-20 13:56:01 -07:00
Nat Goodspeed e8dfbbaf88 SL-19242: Pass channel and imagename to sign-pkg-mac/action.yaml.
The viewer_manifest.py logic to determine the name of the viewer installer
.dmg is a little convoluted. Make it tell viewer-build-util/sign-pkg-mac that
name, rather than passing it all the relevant inputs and composing it
redundantly.

sign-pkg-mac also wants the viewer channel to determine the application name.
2023-09-20 11:34:56 -04:00
Nat Goodspeed 763fcb02b8 SL-19242: Move comments out of YAML parameter text. 2023-09-19 09:15:30 -04:00
Nat Goodspeed bd8ecbb389 SL-19242: Typo in changing from inline to reusable action. 2023-09-18 22:43:16 -04:00
Nat Goodspeed 1184c383e2 SL-19242: release job now depends on package jobs
and uses new viewer-build-util/release-artifacts action.
2023-09-18 22:39:43 -04:00
Nat Goodspeed 7c351379fc SL-19242: Retrieve and decode Windows signing cert, pass to action. 2023-09-15 15:17:40 -04:00
Nat Goodspeed b02249546e SL-19243: Directly reference action subdirs in viewer-build-util
instead of trying to checkout viewer-build-util (which doesn't work) and then
reference action subdirs from the filesystem.

Also engage (initial placeholder) actions to sign and package the
platform-specific application artifacts.
2023-09-12 16:28:09 -04:00
Nat Goodspeed 3e86f26b40 SL-19243: Try to convince GitHub that ./.util is really a path. 2023-09-12 13:55:08 -04:00
Nat Goodspeed d795b49f16 SL-19243: Job step 'uses' must specify action.yaml file
instead of having it implied by specifying the containing directory.
2023-09-12 12:50:13 -04:00
Nat Goodspeed 0992a0af3b SL-19243: Use consolidated viewer-build-util
instead of distinct viewer-post-bugsplat-{windows,mac} repos.
2023-09-12 12:46:28 -04:00
Nat Goodspeed 29300a1fd3 SL-19242: Try harder to post artifacts containing exactly app image.
In a Windows build tree, we don't actually have an app-named top directory, so
don't package its containing directory -- just the app dir itself, e.g.
"newview/Release".

In a Mac build tree, though we do have "Second Life Mumble.app", its parent
directory also contains other large stuff. Try posting a temp directory
containing a symlink to the .app.

Ditch the "!*.bat" exclusion: the presence of a second path (even an
exclusion) changes how upload-artifact nests its contents.
2023-09-11 10:07:51 -04:00
Nat Goodspeed 63d5d38e36 SL-18837: Stop failing build.sh if there's no installer.
This unblocks ReleaseOS builds, and also preps for SL-19242.

Streamline build.sh's Uploads section.
2023-09-08 17:24:04 -04:00
Nat Goodspeed 2d04cc14d3 SL-19242: Post -app artifact, not -exe, with entire install image.
Previously we posted Windows-exe, macOS-exe artifacts that were a little
inconsistent: Windows-exe contained just the Windows executable, whereas
macOS-exe contained the whole .app tree (but without the .app directory).

Change to post Windows-app, macOS-app artifacts that each contain the whole
viewer install image, including the top-level application name directory. This
is what we'll need to codesign and notarize.
2023-09-08 17:01:46 -04:00
Nat Goodspeed c87d9c635b SL-18837: Suppress ReleaseOS for now. 2023-09-08 14:30:05 -04:00
Nat Goodspeed 77227cf5c4 SL-18837: Suppress BUGSPLAT_DB for ReleaseOS builds. 2023-09-07 14:09:54 -04:00
Nat Goodspeed bac73831c0 SL-18837: String literals are single-quoted in GitHub expressions. 2023-09-07 11:48:15 -04:00
Nat Goodspeed 949909013e SL-18837: Segregate ReleaseOS artifacts; don't even upload.
Eliminate references to (no longer set) matrix.addrsize.
2023-09-07 11:38:00 -04:00
Nat Goodspeed b8e6777439 SL-18837: Merge branch 'main' into actions 2023-09-07 11:15:56 -04:00
Ansariel f2f79ca9ce Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/llvocache.cpp
#	indra/newview/pipeline.cpp
2023-09-07 15:44:27 +02:00
Nat Goodspeed 755f9d9ac9 SL-19243: Specify macos-latest for post-mac-symbols.
We want to run on a GitHub-hosted runner rather than one of our own.
2023-09-06 17:03:22 -04:00
Beq aea351aee1 Trigger preview build from branch name 2023-09-05 13:24:21 +01:00
Nat Goodspeed 7cedb1eb20 SL-19243: Add post-mac-symbols job using viewer-post-bugsplat-mac.
The initial viewer-post-bugsplat-mac is just a placeholder so far, but we can
flesh it out while the viewer builds necessitated by this change are running,
and then we can iterate on viewer-post-bugsplat-mac without having to rebuild
the viewer.
2023-09-01 10:53:02 -04:00
Nat Goodspeed 2ee8cb0e16 SL-19243: Job to post windows symbols must run on Windows. 2023-09-01 07:46:32 -04:00
Nat Goodspeed 3147b55cec SL-19243: Fix wonky 'if:' in build.yaml 2023-08-31 17:28:25 -04:00
Nat Goodspeed 348d710707 SL-19243: Fix 'uses:' reference to viewer-post-bugsplat-windows 2023-08-31 16:09:12 -04:00
Nat Goodspeed 58e8c3567f SL-19243: Fix build.yaml syntax error. 2023-08-31 16:06:13 -04:00
Nat Goodspeed e8cd5205e8 SL-19243: Try to run Windows BugSplat uploads as a separate GH job.
Upload a new Windows-exe artifact containing just the executable (needed by
BugSplat) separately from the artifact containing the whole NSIS installer.
This requires a new viewer_exe step output set by viewer_manifest.py.

Define viewer_channel and viewer_version as build job outputs.

Set viewer_channel in build.yaml when tag is interpreted.

Set viewer_version in build.sh at the point when it would have posted
viewer_version.txt to codeticket.

Add a post-windows-symbols job dependent on the build job that engages
secondlife/viewer-post-bugsplat-windows, which in turn engages
secondlife/post-bugsplat-windows. We keep the actual upload code in a separate
repo in case we need to modify that code before rerunning to resolve upload
errors. If we kept the upload code in the viewer repo itself, rerunning the
upload with modifications would necessarily require rerunning the viewer
build, which would defeat the purpose of SL-19243.

Because of that new upload job in build.yaml, skip Windows symbol uploads
in build.sh.

Use a simple (platform name) artifact name for metadata because of
flatten_files.py's filename collision resolution.

Use hyphens, not spaces, in remaining artifact names: apparently
download-artifact doesn't much like artifacts with spaces in their names.

Only run the release job when in fact there's a tag. Without that, we get
errors. We need not create flatten_files.py's output directory beforehand
because it will do that implicitly.
2023-08-31 15:53:56 -04:00
Ansariel f075bf7599 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	.github/workflows/build_viewer.yml
#	indra/newview/llface.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewerregion.cpp
2023-08-31 18:09:40 +02:00
Beq e7246ea176 Make the workaround Windows specific to stop upsetting Mac 2023-08-31 10:36:32 +01:00
Beq 458476b148 Allow nightly trigger and fix up Windows python anomalies
Allow nightly to be triggered by push to a branch called *nightly*
Windows has to expressly  insert itself in the path to pickup the right version.
2023-08-30 23:06:54 +01:00
Beq b7b87c7aaa GHA updates to align with PBR.
fixes expiries and allows nightly testing via branch trigger
2023-08-30 09:51:42 +01:00
Nat Goodspeed b06aa53f59 SL-18837: Only list the downloaded artifacts. 2023-08-29 20:03:21 -04:00
Nat Goodspeed 7779cebdcd SL-18837: Introduce flatten_files.py and use to post release assets 2023-08-29 17:55:53 -04:00
Beq 25d4d8fafd windows needs requirements loaded & use specific version to allow cache 2023-08-29 20:59:43 +01:00
Nat Goodspeed 929aa15c80 SL-18837: Experiment with download-artifact downloading all files. 2023-08-28 13:21:16 -04:00
Ansariel 6009eec757 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-559 2023-08-26 22:08:43 +02:00
Ansariel 4b923d4291 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
2023-08-24 20:48:55 +02:00
Ansariel 9c098fb132 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/llmessage/llregionflags.h
#	indra/newview/llfloaterregioninfo.cpp
2023-08-24 00:32:15 +02:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Beq 9937fe4452 Merge remote-tracking branch 'origin/master' 2023-08-19 16:22:19 +01:00
Nat Goodspeed 70e4c73baa SL-18837: Engage initial GH viewer release script. 2023-08-18 11:28:15 -04:00
Ansariel 34d2f6550b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-09 10:36:35 +02:00
Beq b0217ec21a bad indents kill yaml... 2023-08-06 20:08:43 +01:00
Beq 2e262de012 Allow "alpha" builds to have alternate 3p libs
Should fix nightlies.
2023-08-06 20:02:11 +01:00
Beq 2d9200e617 only ignore 32 bit on SL
alpha goes to preview


Support Alpha and Unknown build types.
2023-08-06 19:48:43 +01:00
Beq f41b9fd1fe Remove 32-bit havok builds as LL no longer provide it. 2023-08-02 18:44:26 +01:00
Beq ed63fa6242 tweak GHA 2023-08-02 09:51:20 +01:00
Beq 90064c38fc GHA support alpha builds 2023-08-02 09:34:39 +01:00
Beq 60705381d0 improved trigger on GHA 2023-08-02 09:29:16 +01:00
Beq b3bde7a446 improved trigger on GHA 2023-08-01 16:09:05 +01:00
Nat Goodspeed 73a857ba31 SL-18837: Use 'needs' context, not 'jobs' context
in release job to reference outputs from the build job.

Also mark the release as prerelease, and fail the release action if we still
can't find the files we're trying to post.
2023-07-22 08:32:21 -04:00
Nat Goodspeed f9a30e7ed1 SL-18837: Try posting build.yaml step outputs as job outputs. 2023-07-22 08:18:13 -04:00
Nat Goodspeed 6605403661 SL-18837: Tags can't have spaces or colons. Look for valid ones. 2023-07-21 15:24:11 -04:00
Nat Goodspeed 7cca3506b6 SL-18837: Try triggering GH release for tag like "Second Life "... 2023-07-21 14:02:00 -04:00
Nat Goodspeed 0d4228b55a SL-18837: Use secondlife -3p/action-gh-release
instead of the original softprops/action-gh-release repo, because organization
rules forbid directly using the softprops repo.
2023-07-18 15:38:44 -04:00
Nat Goodspeed 2b97587a14 SL-18837: Try to post installer and metadata for GH viewer release. 2023-07-18 15:25:09 -04:00
Nat Goodspeed dcb1403661 SL-18837: Re-delete redundant matrix.include python-version.
This clarifies that the matrix.include entry is intended to supplement an
existing runner configuration, rather than adding a new configuration for the
same runner.
2023-07-18 11:41:32 -04:00
Nat Goodspeed a4882870f8 SL-18837: Merge branch 'actions' into actions-build-sh 2023-07-18 11:37:55 -04:00
Nat Goodspeed 6fd46b85f5 SL-18837: Detect msys bash as well as cygwin for native_path et al. 2023-07-18 10:54:12 -04:00
Nat Goodspeed 479fa3e196 SL-18837: Conditionally upload llphysicsextensions-tpv package
but only when building viewer-private.

Also re-fix SL-19942 workaround by deleting AUTOBUILD_CONFIGURATION before
trying to build llphysicsextensions-tpv.
2023-07-18 09:56:11 -04:00
Nat Goodspeed 54f9ca5404 SL-18837: Merge branch 'actions' into actions-build-sh 2023-07-17 15:41:26 -04:00
Brad Linden 0998d46f47 Fix "intermittent" llrand unit test failure on windows on DRTVWR-578. we must return less than 1.0 when rand() returns RAND_MAX
also, disable 32 bit build now that we have deprecated it.
https://community.secondlife.com/blogs/entry/13464-end-of-support-for-second-life-32-bit-windows-viewer-and-updated-minimum-system-requirements-for-macos-to-1013/
2023-07-14 18:05:44 -07:00
Nat Goodspeed d8292a6291 SL-18837: Disable APR_LOG for now, but leave notes for the future. 2023-07-10 14:46:14 -04:00