Skip to content

Commit 6528e72

Browse files
authored
Merge pull request #2655 from sopel-irc/ci-maint-v-prefix
ci: make `v` prefix optional in maintenance branch names
2 parents 44bc866 + 9f24a1a commit 6528e72

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ on:
55
push:
66
branches:
77
- master
8-
- v[0-9]+.[0-9]+.x
8+
- v?[0-9]+.[0-9]+.x
99
- gha-*
1010
pull_request:
1111
branches:
1212
- master
13-
- v[0-9]+.[0-9]+.x
13+
- v?[0-9]+.[0-9]+.x
1414

1515
jobs:
1616
tests:

dev-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ sphinx-rfcsection~=0.1.1
2222
vcrpy @ git+https://github.com/sopel-irc/vcrpy@uncap-urllib3
2323
# also have to use a version of urllib3 that doesn't use the `version_string`
2424
# attr of the response object, because vcrpy won't support it until 7.x
25+
# reverting to mainline vcrpy is tracked in #2456
2526
urllib3<2.3
2627
# type check
2728
# often breaks CI on master, so pin and update deliberately, on our own terms

0 commit comments

Comments
 (0)