Skip to content

Release (Maint W) -> Maint C merge #1177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 182 commits into from
Apr 10, 2024
Merged

Release (Maint W) -> Maint C merge #1177

merged 182 commits into from
Apr 10, 2024

Conversation

marchcat
Copy link
Contributor

No description provided.

nat-goodspeed and others added 30 commits November 2, 2022 12:20
Pull in fix to strip_deprecated_header() call.
for strip_deprecated_header(header_size) and Python llsd module fixes.
There is still a chance user will try to move multiple landmarks one after another, but if it didn't update in the time user moves landmarks it's going to end up out of order either way
Same thing as commit cf692c4
which was removed due to shutdown freezes.
Error thread is no longer there so doesn't cause any race sonditions,
was not able to repro any issues so will ask QA to test shutdown
nat-goodspeed and others added 20 commits February 26, 2024 12:20
Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]
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.
instead of on the current tag 7.1.2-release.
Generate release notes from tag `release` to the built tag.
instead of the branch that got pulled.
Closing window correctly caused a significant amount of logout freezes
with no known reproes. Temporarily returning to old behavior were thread
was killes without closing window and will reenable in later maints to
hopefully get a scenario or at least more data of what is causing the
freeze.
# Conflicts:
#	.github/workflows/build.yaml
following promotion of secondlife/viewer #690
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@marchcat marchcat added this to the Maintenance C milestone Apr 10, 2024
@marchcat marchcat changed the base branch from main to release/maint-c April 10, 2024 01:32
@marchcat marchcat requested a review from akleshchev April 10, 2024 01:33
@marchcat marchcat marked this pull request as ready for review April 10, 2024 01:33
@marchcat marchcat merged commit 5af93ff into release/maint-c Apr 10, 2024
13 checks passed
@marchcat marchcat deleted the marchcat/c-merge branch April 10, 2024 07:30
@github-actions github-actions bot locked and limited conversation to collaborators Apr 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.