Skip to content

Sync upstream tag 20260414#6

Draft
Schamper wants to merge 11 commits intomainfrom
sync/20260414
Draft

Sync upstream tag 20260414#6
Schamper wants to merge 11 commits intomainfrom
sync/20260414

Conversation

@Schamper
Copy link
Copy Markdown
Member

Warning

Merge conflicts detected when merging upstream tag 20260414 into main.
The conflict markers have been committed so they are visible in the PR diff.

Conflicting files

.github/workflows/release.yml
src/validation.rs

Resolution

git fetch origin
git checkout sync/20260414
# Resolve conflict markers
git add -A && git commit -m "Resolve merge conflicts for 20260414"
git push origin sync/20260414

zanieb and others added 10 commits April 7, 2026 18:01
…tral-sh#1081)

Pre-releases do not allow additional artifact uploads when the GitHub
"immutable release" feature is used. It's not clear to me why we use a
pre-release instead of a draft release, which is not user visible and
seems generally superior for staging artifacts.
The default page size times out server side after 10s.

A page size of 5 takes 2s. We can generally expect this to be the latest
release though, so 1 per page seems fine.
This includes moving the versions publish into the release workflow to
avoid a second environment activation
Explicitly disable an executable stack on all Linux targets, even when
cross-compiling.

Follow up to test failures cased by astral-sh#1070

---------

Co-authored-by: Geoffrey Thomas <geofft@ldpreload.com>
This allows a deployment to succeed so the tag can be subsequently
pushed
@Schamper Schamper added the sync Automated upstream sync label Apr 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sync Automated upstream sync

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants