[DEV-22502] - v2 -> master

.github/scripts/autorelease.py

@@ -46,17 +46,30 @@ def get_release_tags(github_token: str) -> List[str]:
         params["page"] += 1
 
 
-def main(github_token: str, current_branch: str) -> None:
-    branch_pattern = r"^v(?P<major_release>\d+)$"
-    branch_matching = re.match(branch_pattern, current_branch, re.I)
-    if not branch_matching:
-        logger.info("Branch %s is not a valid release branch", current_branch)
-        return
+RELEASE_BRANCH = "master"
+LEGACY_BRANCH_PATTERN = re.compile(r"^v(?P<major_release>\d+)$", re.I)
+
+
+def get_major_release(current_branch: str, project_version_str: str) -> Optional[str]:
+    if current_branch == RELEASE_BRANCH:
+        return str(Version(project_version_str).major)
+
+    branch_matching = LEGACY_BRANCH_PATTERN.match(current_branch)
+    if branch_matching:
+        return branch_matching.group("major_release")
 
-    major_release = branch_matching.group("major_release")
+    return None
+
+
+def main(github_token: str, current_branch: str) -> None:
     project_version_str = get_project_version()
     logger.info("Project version %s", project_version_str)
 
+    major_release = get_major_release(current_branch, project_version_str)
+    if major_release is None:
+        logger.info("Branch %s is not a valid release branch", current_branch)
+        return
+
     if not project_version_str.startswith(major_release):
         logger.info(
             "Release tag %s is invalid, major releases in the %s branch must start with %s",

.github/workflows/autorelease.yml

@@ -3,21 +3,29 @@ name: Autorelease
 on:
   pull_request:
     types: [ closed ]
+    branches: [ master, v2 ]
 
 jobs:
   autorelease:
     if: github.event.pull_request.merged == true
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ '3.8.16' ]
+
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
       - name: Set up PDM
         uses: pdm-project/setup-pdm@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+          version: 2.20.1
 
       - name: Install dependencies
         run: pdm install -dG release

.github/workflows/publish.yml

@@ -6,13 +6,27 @@ on:
 
 jobs:
   build-and-publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ '3.8.16' ]
+
     permissions:
       id-token: write
+
     steps:
       - uses: actions/checkout@v3
+
+      - name: Set up python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
       - name: Set up PDM
         uses: pdm-project/setup-pdm@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+          version: 2.20.1
 
       - name: Publish package distributions to PyPI
         run: pdm publish

.github/workflows/python-linters.yml

@@ -3,7 +3,7 @@ name: Linters
 on:
   push:
   pull_request:
-    branches: [ master ]
+    branches: [ master, v2 ]
 
 jobs:
   build:
@@ -18,6 +18,7 @@ jobs:
         uses: pdm-project/setup-pdm@v3
         with:
           python-version: ${{ matrix.python-version }}
+          version: 2.20.1
 
       - name: Install dependencies
         run: |

.github/workflows/python-tests.yml

@@ -3,7 +3,7 @@ name: Tests
 on:
   push:
   pull_request:
-    branches: [ master ]
+    branches: [ master, v2 ]
 
 jobs:
   test:
@@ -19,6 +19,7 @@ jobs:
         uses: pdm-project/setup-pdm@v3
         with:
           python-version: ${{ matrix.python-version }}
+          version: 2.20.1
 
       - name: Install dependencies
         run: |