Skip to content

Use master rather than pr build for hotfix branch#7095

Merged
grzesiek2010 merged 2 commits intogetodk:v2026.1.xfrom
seadowg:ci-regex
Feb 17, 2026
Merged

Use master rather than pr build for hotfix branch#7095
grzesiek2010 merged 2 commits intogetodk:v2026.1.xfrom
seadowg:ci-regex

Conversation

@seadowg
Copy link
Member

@seadowg seadowg commented Feb 13, 2026

This wasn't working because the regex we were using only matches actual semvers and hour hotfix branches end with an x.

@seadowg seadowg changed the base branch from master to v2026.1.x February 13, 2026 09:02
@seadowg seadowg marked this pull request as ready for review February 13, 2026 09:03
@seadowg seadowg requested a review from grzesiek2010 February 13, 2026 09:03
ignore:
- master
- /^v((20)[0-9]{2})\.\d+\.\d+$/
- ^v((20)[0-9]{2})\.\d+\.\x$
Copy link
Member

Choose a reason for hiding this comment

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

I think the pattern ^v((20)[0-9]{2})\.\d+\.\x$ might not work as expected. \x looks like an incomplete escape sequence and doesn’t match a literal x, so this regex probably won’t match either v2026.1.1 or v2026.1.x.
It should be something like: ^v((20)[0-9]{2})\.\d+\.(\d+|x)$

Copy link
Member Author

Choose a reason for hiding this comment

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

We only want to match the literal x here as we never create branches like v2026.1.1. You're right though that I've got a typo here with \x - it should just be x/.

@grzesiek2010 grzesiek2010 merged commit f7c1269 into getodk:v2026.1.x Feb 17, 2026
8 checks passed
@seadowg seadowg deleted the ci-regex branch February 17, 2026 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants