Skip to content

Release v2026.2.1 - #2081

Open
matthew-white wants to merge 12 commits into
masterfrom
next
Open

Release v2026.2.1#2081
matthew-white wants to merge 12 commits into
masterfrom
next

Conversation

@matthew-white

@matthew-white matthew-white commented Jul 21, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

This PR prepares the release of v2026.2.1. It should only contain changes from other PRs that have already been approved and merged (and possibly merge commits from the master branch).

alxndrsn added 8 commits July 7, 2026 05:54
@alxndrsn
ci/build-push-image: fix nginx FRONTEND_BUILD_MODE error (#2042) (#2049)
d42f25b 
Fixes error seen on release:

```
> [linux/amd64 intermediate 4/5] RUN files/prebuild/write-version.sh:
0.073 files/prebuild/write-version.sh: line 26: FRONTEND_BUILD_MODE: unbound variable
```
@alxndrsn
test/nginx/request(): use WHATWG Responses (#2045)
e02a051 
Simplifies test `request()` implementation to use standard `Response` classes.  The `request()` function aims to be as similar to `fetch()` as possible, while allowing for non-standard behaviour necessary for tests.  Not using `Response` was an oversight in the initial implementation.
@alxndrsn
test/nginx: prefix test-specific server endpoints (#2046)
265f561 
Help reason about routing by clearly delineating test-specific paths from those which are shadowing real paths.
@alxndrsn
ci: fix publish_images var name & label (#2061)
42b4e0d 
Selecting this option publishes more than 1 image.
@alxndrsn
ci: error if FRONTEND_VERSION not found (#2050)
fa9bc26 
Re #2042 (comment)

Adding `-e` isn't enough to cause a helpful failure when `FRONTEND_VERSION` is missing from `docker-compose.yml` because:

1. it doesn't fail, despite `bash -e`, because the `jq` command runs inside the `echo` call, which succeeds, and
2. if the intention is for the failure to be easy to understand, `jq -e` won't help on its own
@alxndrsn
service/start-odk: fix DB_SSL check in non envs (#2064)
348b9c9 
Closes #2063
@alxndrsn
nginx/selfsign: use standard RSA key size (#2035)
1440f41 
The previous size of 4086 was likely copied from the README for `marvambass/nginx-ssl-secure` (https://github.com/MarvAmBass/docker-nginx-ssl-secure).  This was the original nginx base image used in this repo, introduced in 7cd48f7.

Per https://github.com/MarvAmBass/docker-nginx-ssl-secure#8, 4086 was a typo.

There's no obvious benefit to using a non-standard key size, and it's likely to cause confusion, and maybe affect security scoring.
@alxndrsn
test/nginx: make SENTRY_DSN_FRONTEND value realistic (#2067)
413683d
@matthew-white matthew-white changed the title Next Release v2026.3 Jul 21, 2026
@matthew-white

matthew-white commented Jul 21, 2026

Copy link
Copy Markdown
Member Author

@alxndrsn what do you think is the best way to resolve the merge conflict on this branch?

@matthew-white

matthew-white commented Jul 21, 2026

Copy link
Copy Markdown
Member Author

If we have a situation like this in the future, where we need a PR on both master and next, I think the easiest approach is to merge master into next or (in some cases) to hard-reset the tip of the next branch to the tip of the master branch.

@matthew-white

matthew-white commented Jul 24, 2026

Copy link
Copy Markdown
Member Author

Looking at the diff on this PR, it seems to me that "Accept current change" is the right option. @alxndrsn does that sound right? I can make the merge commit if you wouldn't mind verifying it.

@alxndrsn

alxndrsn commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

Looking at the diff on this PR, it seems to me that "Accept current change" is the right option.

Yes, maintain the changes from https://github.com/getodk/central/pull/2050/changes 👍

@matthew-white

matthew-white commented Jul 24, 2026

Copy link
Copy Markdown
Member Author

Sounds good, pretty sure I did it right!

@matthew-white matthew-white changed the title Release v2026.3 Release v2026.2.1 Jul 24, 2026
@matthew-white

matthew-white commented Jul 24, 2026

Copy link
Copy Markdown
Member Author

I've updated the PR title to reflect the fact that we now plan to include all commits on the next branch with the patch release v2026.2.1.

@matthew-white

matthew-white commented Jul 30, 2026

Copy link
Copy Markdown
Member Author

I'm going to go ahead and mark this PR as ready for review, since it contains almost all the changes we intend to include in the release.

I think all that's needed to review this PR is to check that all commits are either:

  • From other PRs that have already been approved and merged
  • Merge commits from the master branch

@matthew-white
matthew-white marked this pull request as ready for review July 30, 2026 04:57
latin-panda
latin-panda approved these changes Jul 30, 2026
View reviewed changes

@latin-panda latin-panda left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It includes all the commits we discussed in the team chat

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@latin-panda latin-panda latin-panda approved these changes
@sadiqkhoja sadiqkhoja Awaiting requested review from sadiqkhoja

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@matthew-white @alxndrsn @latin-panda