Merge pull request #2655 from sopel-irc/ci-maint-v-prefix

ci: make `v` prefix optional in maintenance branch names
sopel-irc · Feb 5, 2025 · 6528e72 · 6528e72
2 parents 44bc866 + 9f24a1a
commit 6528e72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,12 +5,12 @@ on:
   push:
     branches:
       - master
-      - v[0-9]+.[0-9]+.x
+      - v?[0-9]+.[0-9]+.x
       - gha-*
   pull_request:
     branches:
       - master
-      - v[0-9]+.[0-9]+.x
+      - v?[0-9]+.[0-9]+.x
 
 jobs:
   tests:

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -22,6 +22,7 @@ sphinx-rfcsection~=0.1.1
 vcrpy @ git+https://github.com/sopel-irc/vcrpy@uncap-urllib3
 # also have to use a version of urllib3 that doesn't use the `version_string`
 # attr of the response object, because vcrpy won't support it until 7.x
+# reverting to mainline vcrpy is tracked in #2456
 urllib3<2.3
 # type check
 # often breaks CI on master, so pin and update deliberately, on our own terms