Remove dev branch support (#495)

makubacki · web-flow · commit 0605cb0d92ff · 2025-09-19T16:22:26.000-07:00
Project Mu is dropping the concept of "dev" and "release" branches in
favor of having only a "release" branch. This change reverts support
added for the branch split.

Signed-off-by: Michael Kubacki &lt;michael.kubacki@microsoft.com&gt;
diff --git a/.github/workflows/ReleaseDrafter.yml b/.github/workflows/ReleaseDrafter.yml
@@ -11,10 +11,10 @@
 #
 #   1. A "latest release branch"
 #      - Example: `release/202405`
-#      - Config file: `release-draft-config-n.yml` and `release-draft-config-n-dev.yml`
+#      - Config file: `release-draft-config-n.yml`
 #   2. A "previous release branch"
 #      - Example: `release/202311`
-#      - Config file: `release-draft-config-n-1.yml` and `release-draft-config-n-1-dev.yml`
+#      - Config file: `release-draft-config-n-1.yml`
 #   3. A "main branch"
 #      - Example: `main`
 #      - Config file: `release-draft-config.yml`
@@ -72,135 +72,31 @@ jobs:
         run: |
           fileContent=$(cat "${FILE_PATH}")
           latestMuReleaseBranch=$(echo "$fileContent" | grep -oP '(?<=latest_mu_release_branch = ").*(?=")')
-          latestMuDevBranch=$(echo "$latestMuReleaseBranch" | sed 's/release/dev/')
           previousMuReleaseBranch=$(echo "$fileContent" | grep -oP '(?<=previous_mu_release_branch = ").*(?=")')
-          previousMuDevBranch=$(echo "$previousMuReleaseBranch" | sed 's/release/dev/')
-          echo "latest_mu_release_branch=${latestMuReleaseBranch}" >> $GITHUB_ENV
-          echo "latest_mu_dev_branch=${latestMuDevBranch}" >> $GITHUB_ENV
-          echo "latest_mu_dev_branch_full=refs/heads/${latestMuDevBranch}" >> $GITHUB_ENV
-          echo "latest_mu_release_branch_full=refs/heads/${latestMuReleaseBranch}" >> $GITHUB_ENV
-          echo "previous_mu_release_branch=${previousMuReleaseBranch}" >> $GITHUB_ENV
-          echo "previous_mu_dev_branch=${previousMuDevBranch}" >> $GITHUB_ENV
-          echo "previous_mu_dev_branch_full=refs/heads/${previousMuDevBranch}" >> $GITHUB_ENV
-          echo "previous_mu_release_branch_full=refs/heads/${previousMuReleaseBranch}" >> $GITHUB_ENV
-      - name: Build a ${{ env.latest_mu_release_branch }} Draft
-        if: ${{ startsWith(github.ref, env.latest_mu_dev_branch_full) }}
+          echo "latest_mu_branch=${latestMuReleaseBranch}" >> $GITHUB_ENV
+          echo "latest_mu_branch_full=refs/heads/${latestMuReleaseBranch}" >> $GITHUB_ENV
+          echo "previous_mu_branch=${previousMuReleaseBranch}" >> $GITHUB_ENV
+          echo "previous_mu_branch_full=refs/heads/${previousMuReleaseBranch}" >> $GITHUB_ENV
+      - name: Build a ${{ env.latest_mu_branch }} Draft
+        if: ${{ startsWith(github.ref, env.latest_mu_branch_full) }}
         id: update_draft_n
         uses: release-drafter/release-drafter@v6.1.0
         with:
           # Note: Path is relative to .github/
           config-name: release-draft-config-n.yml
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-      - name: Draft Release for Current (${{ env.latest_mu_release_branch }}) Release Branch
-        if: steps.update_draft_n.outcome == 'success'
-        run: |
-          # Prepare the release body
-          release_body_path="${{ runner.temp }}/release_body.txt"
-          release_body=$(cat <<'EOF'
-          ${{ steps.update_draft_n.outputs.body }}
-          EOF
-          )
-          release_body="${release_body//\`/\\\`}"
-          echo "${release_body}" > $release_body_path
-          sed -i 's/\\`/`/g' $release_body_path
-          sed -i '/\**Full Changelog\**:/d' $release_body_path
-
-          # Get the new tag and title
-          new_tag=$(echo "${{ steps.update_draft_n.outputs.tag_name }}" | sed 's/dev-//')
-          new_title=$(echo "${{ steps.update_draft_n.outputs.tag_name }}" | sed 's/dev/release/')
-
-          # Determine the corresponding tag names
-          existing_tag_prefix=""
-          tag_regex="v([0-9]{6}).*\."
-          if [[ $new_tag =~ $tag_regex ]]; then
-            existing_tag_prefix="${BASH_REMATCH[1]}"
-          fi
-
-          # Delete the template dev draft created
-          gh release delete "${{ steps.update_draft_n.outputs.tag_name }}" --repo ${{ github.repository }} --yes
-
-          # Delete any existing draft releases for this release branch
-          for tag in $(gh release list --repo ${{ github.repository }} --json tagName,isPrerelease,isDraft --jq ".[] | select(.isDraft == true and .isPrerelease == false and (.tagName | startswith(\"v$existing_tag_prefix\"))) | .tagName"); do
-            gh release delete "$tag" --repo ${{ github.repository }} --yes
-          done
-
-          gh release create "$new_tag" \
-            --repo "${{ github.repository }}" \
-            --target "${{ env.latest_mu_release_branch_full }}" \
-            --title "$new_title" \
-            --notes-file "$release_body_path" \
-            --draft
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-      - name: Build a ${{ env.previous_mu_release_branch }} Draft
-        if: ${{ startsWith(github.ref, env.previous_mu_dev_branch_full) }}
+      - name: Build a ${{ env.previous_mu_branch }} Draft
+        if: ${{ startsWith(github.ref, env.previous_mu_branch_full) }}
         id: update_draft_n_1
         uses: release-drafter/release-drafter@v6.1.0
         with:
           # Note: Path is relative to .github/
           config-name: release-draft-config-n-1.yml
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-      - name: Draft Release for N-1 (${{ env.previous_mu_release_branch }}) Release Branch
-        if: steps.update_draft_n_1.outcome == 'success'
-        run: |
-          # Prepare the release body
-          release_body_path="${{ runner.temp }}/release_body.txt"
-          release_body=$(cat <<'EOF'
-          ${{ steps.update_draft_n_1.outputs.body }}
-          EOF
-          )
-          release_body="${release_body//\`/\\\`}"
-          echo "${release_body}" > $release_body_path
-          sed -i 's/\\`/`/g' $release_body_path
-          sed -i '/\**Full Changelog\**:/d' $release_body_path
-
-          # Get the new tag and title
-          new_tag=$(echo "${{ steps.update_draft_n_1.outputs.tag_name }}" | sed 's/dev-//')
-          new_title=$(echo "${{ steps.update_draft_n_1.outputs.tag_name }}" | sed 's/dev/release/')
-
-          # Determine the corresponding tag names
-          existing_tag_prefix=""
-          tag_regex="v([0-9]{6}).*\."
-          if [[ $new_tag =~ $tag_regex ]]; then
-            existing_tag_prefix="${BASH_REMATCH[1]}"
-          fi
-
-          # Delete the template dev draft created
-          gh release delete "${{ steps.update_draft_n_1.outputs.tag_name }}" --repo ${{ github.repository }} --yes
-
-          # Delete any existing draft releases for this release branch
-          for tag in $(gh release list --repo ${{ github.repository }} --json tagName,isPrerelease,isDraft --jq ".[] | select(.isDraft == true and .isPrerelease == false and (.tagName | startswith(\"v$existing_tag_prefix\"))) | .tagName"); do
-            gh release delete "$tag" --repo ${{ github.repository }} --yes
-          done
-
-          gh release create "$new_tag" \
-            --repo "${{ github.repository }}" \
-            --target "${{ env.previous_mu_release_branch_full }}" \
-            --title "$new_title" \
-            --notes-file "$release_body_path" \
-            --draft
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-      - name: Create the ${{ env.latest_mu_dev_branch }} Draft
-        if: ${{ startsWith(github.ref, env.latest_mu_dev_branch_full) }}
-        uses: release-drafter/release-drafter@v6.1.0
-        with:
-          # Note: Path is relative to .github/
-          config-name: release-draft-config-n-dev.yml
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-      - name: Create the ${{ env.previous_mu_dev_branch }} Draft
-        if: ${{ startsWith(github.ref, env.previous_mu_dev_branch_full) }}
-        uses: release-drafter/release-drafter@v6.1.0
-        with:
-          # Note: Path is relative to .github/
-          config-name: release-draft-config-n-1-dev.yml
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
       - name: Build the New Release Draft
-        if: ${{ !startsWith(github.ref, 'refs/heads/release') && !startsWith(github.ref, 'refs/heads/dev') }}
+        if: ${{ !startsWith(github.ref, 'refs/heads/release') }}
         id: update_draft_non_release
         uses: release-drafter/release-drafter@v6.1.0
         with:
diff --git a/.sync/Files.yml b/.sync/Files.yml
@@ -365,20 +365,6 @@ group:
       microsoft/mu_tiano_platforms
       microsoft/mu_tiano_plus
 
-# Leaf Workflow - Backport Dev Branch Changes to Release Branch
-  - files:
-    - source: .sync/workflows/leaf/backport-to-release-branch.yml
-      dest: .github/workflows/backport-to-release-branch.yml
-      template: true
-    repos: |
-      microsoft/mu_basecore
-      microsoft/mu_common_intel_min_platform
-      microsoft/mu_oem_sample
-      microsoft/mu_plus
-      microsoft/mu_silicon_arm_tiano
-      microsoft/mu_silicon_intel_tiano
-      microsoft/mu_tiano_plus
-
 # Leaf Workflow - CodeQL
 # Note: This workflow should be used in repos that build firmware
 #       packages from a CI builder (i.e. a CISettings.py file).
@@ -592,30 +578,14 @@ group:
   - files:
     - source: .sync/workflows/leaf/release-draft.yml
       dest: .github/workflows/release-draft.yml
-      template:
-        depend_on_backport: true
     - source: .sync/workflows/config/release-draft/release-draft-config.yml
       dest: .github/release-draft-config-n.yml
       template:
-        filter_to_backport: true
-        latest: true
-        release_branch: true
-    - source: .sync/workflows/config/release-draft/release-draft-config.yml
-      dest: .github/release-draft-config-n-dev.yml
-      template:
-        filter_to_backport: false
         latest: true
         release_branch: true
     - source: .sync/workflows/config/release-draft/release-draft-config.yml
       dest: .github/release-draft-config-n-1.yml
       template:
-        filter_to_backport: true
-        latest: false
-        release_branch: true
-    - source: .sync/workflows/config/release-draft/release-draft-config.yml
-      dest: .github/release-draft-config-n-1-dev.yml
-      template:
-        filter_to_backport: false
         latest: false
         release_branch: true
     repos: |
@@ -665,29 +635,13 @@ group:
     repos: |
       microsoft/mu_tiano_platforms
 
-# Pull Request Template - Common Template - Backport Option
+# Pull Request Template - Common Template
   - files:
     - source: .sync/github_templates/pull_requests/pull_request_template.md
       dest: .github/pull_request_template.md
-      template:
-        additional_checkboxes:
-          - Backport to release branch?
     repos: |
       microsoft/mu_basecore
       microsoft/mu_common_intel_min_platform
-      microsoft/mu_oem_sample
-      microsoft/mu_plus
-      microsoft/mu_silicon_arm_tiano
-      microsoft/mu_silicon_intel_tiano
-      microsoft/mu_tiano_plus
-
-# Pull Request Template - Common Template
-  - files:
-    - source: .sync/github_templates/pull_requests/pull_request_template.md
-      dest: .github/pull_request_template.md
-      template:
-        additional_checkboxes: []
-    repos: |
       microsoft/mu_crypto_release
       microsoft/mu_feature_config
       microsoft/mu_feature_debugger
@@ -696,10 +650,15 @@ group:
       microsoft/mu_feature_ipmi
       microsoft/mu_feature_mm_supv
       microsoft/mu_feature_uefi_variable
+      microsoft/mu_oem_sample
+      microsoft/mu_plus
       microsoft/mu_rust_helpers
       microsoft/mu_rust_hid
       microsoft/mu_rust_pi
+      microsoft/mu_silicon_arm_tiano
+      microsoft/mu_silicon_intel_tiano
       microsoft/mu_tiano_platforms
+      microsoft/mu_tiano_plus
       microsoft/secureboot_objects
 
 # Rust - Pipeline Files
diff --git a/.sync/github_templates/pull_requests/pull_request_template.md b/.sync/github_templates/pull_requests/pull_request_template.md
@@ -9,9 +9,6 @@ For details on how to complete these options and their meaning refer to [CONTRIB
 - [ ] Breaking change?
 - [ ] Includes tests?
 - [ ] Includes documentation?
-{% for additional_checkbox in additional_checkboxes %}
-- [ ] {{ additional_checkbox }}
-{% endfor %}
 
 ## How This Was Tested
 
diff --git a/.sync/workflows/config/label-issues/regex-pull-requests.yml b/.sync/workflows/config/label-issues/regex-pull-requests.yml
@@ -17,22 +17,6 @@ version: 1
 issues: False
 
 labels:
-  - label: type:backport
-    type: "pull_request"
-    body: '\s*\[\s*(x|X){1}\s*\]\s*Backport to release branch\?'
-
-  - label: type:backport
-    type: "pull_request"
-    authors: ["mu-automation[bot]"]
-    branch : "repo-sync/mu_devops/default"  
-    base-branch: "dev/20[0-9]{4}"
-
-  - label: type:backport
-    type: "pull_request"
-    authors: ["dependabot[bot]"]
-    branch : "dependabot/*"
-    base-branch: "dev/20[0-9]{4}"
-
   - label: impact:breaking-change
     type: "pull_request"
     body: '\s*\[\s*(x|X){1}\s*\]\s*Breaking\s*change\?'
diff --git a/.sync/workflows/config/release-draft/release-draft-config.yml b/.sync/workflows/config/release-draft/release-draft-config.yml
@@ -19,37 +19,23 @@
 
 {% import '../../../Version.njk' as sync_version -%}
 
-{%- if release_branch %}
-name-template: 'dev-v$RESOLVED_VERSION'
-tag-template: 'dev-v$RESOLVED_VERSION'
-{% else %}
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'v$RESOLVED_VERSION'
-{% endif %}
 
 {# `release_branch` applies a commitish. `latest` then determines the branch to use. -#}
 {# If a commitish is not specified, then the `github.ref` value is implicitly used. -#}
 {%- if release_branch %}
-{%- set latest_mu_dev_branch = "refs/heads/" + (sync_version.latest_mu_release_branch | replace("release", "dev")) %}
-{%- set previous_mu_dev_branch = "refs/heads/" + (sync_version.previous_mu_release_branch | replace("release", "dev")) %}
-{%- set actual_branch = latest_mu_dev_branch if latest else previous_mu_dev_branch %}
-commitish: {{ actual_branch }}
+{% set release_branch = "refs/heads/" + (sync_version.latest_mu_release_branch if latest else sync_version.previous_mu_release_branch) %}
+commitish: {{ release_branch }}
 filter-by-commitish: true
-{% if filter_to_backport %}
-include-labels: ["type:backport"]
-{% endif %}
 {% endif %}
 
 template: |
   # What's Changed
 
   $CHANGES
 
-{% if release_branch %}
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION
-{% else %}
   **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
-{% endif %}
 
 categories:
   - title: '⚠️ Breaking Changes'
diff --git a/.sync/workflows/leaf/backport-to-release-branch.yml b/.sync/workflows/leaf/backport-to-release-branch.yml
diff --git a/.sync/workflows/leaf/release-draft.yml b/.sync/workflows/leaf/release-draft.yml
