Skip to content

Correct and simplify branch/tag filtering#7145

Merged
seadowg merged 2 commits intogetodk:v2026.1.xfrom
seadowg:fix-branches
Mar 18, 2026
Merged

Correct and simplify branch/tag filtering#7145
seadowg merged 2 commits intogetodk:v2026.1.xfrom
seadowg:fix-branches

Conversation

@seadowg
Copy link
Copy Markdown
Member

@seadowg seadowg commented Mar 18, 2026

It looked to me like our branch filtering wasn't working correctly and from looking at the config I think we were just missing wrapping our regex in / (which it seems Circle CI needs). I've also simplified the regex(s) we use here. For double-checking:

  • pr should run for branches that aren't master or hotfix branches (like v123.123.x)
  • master is the opposite (it runs for master and hotfix branches)
  • release should run for release tags (like v123.123.123).

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

Choose a reason for hiding this comment

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

Maybe add a $ at the end? Unlikely we'd have a branch name with something after the x but to be really explicit...

@seadowg seadowg requested a review from lognaturel March 18, 2026 17:59
@seadowg seadowg merged commit bcfe97c into getodk:v2026.1.x Mar 18, 2026
8 checks passed
@seadowg seadowg deleted the fix-branches branch March 18, 2026 18:30
seadowg added a commit to seadowg/collect that referenced this pull request Mar 19, 2026
Correct and simplify branch/tag filtering
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