Commit Graph

298 Commits (cbf6aca2e8ebd32d29b70f2d582044153da05eab)

Author SHA1 Message Date
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
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
Brad Linden 231062d532 Fix github actions dependency deprecations 2024-03-12 17:49:19 -07: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 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