Change uplift process to branch-specific pull requests

Author: coreycb

.github/workflows/pulls-merged.yml

@@ -5,7 +5,7 @@ name: PR Merged Actions
 # Don't add any steps that act on external code.
 on:
   pull_request_target:
-    branches: [main]
+    branches: [main, beta, release]
     types: [closed]
 
 permissions:
@@ -32,16 +32,24 @@ jobs:
           PR_NUMBER: ${{  github.event.pull_request.number  }}
           GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: |
-          # The furthest open milestone in the future should be current main
-          gh api repos/$GITHUB_REPOSITORY/milestones --jq '
-                map(select(.state == "open" and .due_on != null))
+          # There should be exactly 3 milestones open at all times
+          TARGET_BRANCH="${{ github.base_ref }}"
+          case "$TARGET_BRANCH" in
+            main) milestone_index=0 ;;
+            beta) milestone_index=1 ;;
+            release) milestone_index=2 ;;
+          esac
+          echo "$milestone_index"
+          gh api repos/$GITHUB_REPOSITORY/milestones --jq "
+                map(select(.state == \"open\" and .due_on != null))
                 | sort_by(.due_on) | reverse
-                | .[0] | { number, title }
+                | .[${milestone_index}] | { number, title }
                 | to_entries
-                | map(.key + "=" + (.value|tostring)) | join("\n")' | tee -a $GITHUB_OUTPUT
+                | map(.key + \"=\" + (.value|tostring)) | join(\"\n\")" | tee -a $GITHUB_OUTPUT
 
       - name: Thank you
         if: |
+          github.base_ref == 'main' &&
           github.event.pull_request.author_association != 'OWNER' &&
           github.event.pull_request.author_association != 'MEMBER' &&
           github.event.pull_request.author_association != 'COLLABORATOR' &&

.github/workflows/pulls-opened.yml

@@ -0,0 +1,48 @@
+---
+name: PR Opened Actions
+
+# Warning, this job is running on pull_request_target and therefore has access to issue content.
+# Don't add any steps that act on external code.
+on:
+  pull_request_target:
+    branches: [beta, release]
+    types: [opened]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  pull-request-opened:
+    runs-on: ubuntu-latest
+    environment: botmobile
+    steps:
+      - name: App token generate
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e  # v2.0.6
+        if: ${{ vars.BOT_CLIENT_ID }}
+        id: app-token
+        with:
+          app-id: ${{ vars.BOT_CLIENT_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Uplift Approval Request
+        env:
+          PR_NUMBER: ${{  github.event.pull_request.number  }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
+          MILESTONE: ${{ steps.milestone.outputs.title }}
+          MESSAGE: |
+            Thank you for your uplift request! Please add a comment with the following approval request template filled out.
+
+            **[Approval Request]**
+            Original Issue/Pull request:
+            Regression caused by (issue #):
+            User impact if declined:
+            Testing completed (on daily, etc.):
+            Risk to taking this patch (and alternatives if risky):
+        run: |
+          if gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json comments \
+            --jq '.comments[].body' | grep -q '\[Approval Request\]'; then
+            echo "Approval Request already exists. Skipping comment."
+            exit 0
+          fi
+
+          gh pr comment "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --body "$MESSAGE"

docs/ci/RELEASE.md

@@ -191,7 +191,8 @@ The app-k9mail/src/main/res/raw/changelog_master.xml should not include any beta
 
 ## Branch Uplifts
 
-If the urgency of a fix requires it to be included in the Beta or Release channel before the next merge, the uplift process is followed. If possible, uplifts should be avoided and patches should “ride the train” instead, following the merge day cycle.
+If the urgency of a fix requires it to be included in the Beta or Release channel before the next merge, the uplift process is followed.
+If possible, uplifts should be avoided and patches should “ride the train” instead, following the merge day cycle.
 
 ### Uplift Criteria
 
@@ -210,15 +211,14 @@ Release uplifts should additionally:
 
 ### Uplift Process
 
-1. The requestor adds the "task: uplift to beta" or "task: uplift to release" label to a merged pull request.
-2. The requestor makes a comment in the associated issue with the Approval Request Comment template filled out.
-3. The release driver reviews all uplift requests and, retaining the label for approved uplifts and removing the label for rejected uplifts.
-4. The release driver runs the Uplift Merges action for the specified target branch, which will remove the label, adjust the milestone, cherry-pick the commits, and push to the target branch.
+1. The requestor creates a pull request against the target uplift branch.
+2. The requestor adds a comment to the pull request with the Approval Request template filled out.
+3. The release driver reviews the uplift request, merging if approved, or closing with a comment if rejected.
 
 Template for uplift requests:
 
 ```sh
-[Approval Request Comment]
+[Approval Request]
 Original Issue/Pull request:
 Regression caused by (issue #):
 User impact if declined: