From b86dbd0b8c0dffba4e9e7756c170c0408aa762e9 Mon Sep 17 00:00:00 2001
From: Lubos Mjachky <lubos.mjachky@gmail.com>
Date: Thu, 18 Nov 2021 15:02:40 +0100
Subject: [PATCH] Make the stage-changelog file agnostic to a default branch

closes #526
---
 CHANGES/526.bugfix                                            | 1 +
 plugin-template                                               | 1 +
 templates/github/.github/workflows/release.yml.j2             | 4 ++--
 ...-master.py.j2 => stage-changelog-for-default-branch.py.j2} | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 CHANGES/526.bugfix
 rename templates/github/.github/workflows/scripts/{stage-changelog-for-master.py.j2 => stage-changelog-for-default-branch.py.j2} (98%)

diff --git a/CHANGES/526.bugfix b/CHANGES/526.bugfix
new file mode 100644
index 00000000..f7cbdf40
--- /dev/null
+++ b/CHANGES/526.bugfix
@@ -0,0 +1 @@
+Made the file for staging changelogs branch agnostic.
diff --git a/plugin-template b/plugin-template
index eb698586..dbbc7c37 100755
--- a/plugin-template
+++ b/plugin-template
@@ -88,6 +88,7 @@ DEPRECATED_FILES = {
         ".ci/scripts/release_requirements.txt",
         ".ci/scripts/release.py",
         ".github/workflows/fips.yml",
+        ".github/workflows/scripts/stage-changelog-for-master.py",
         ".travis",
         ".travis.yml",
     ],
diff --git a/templates/github/.github/workflows/release.yml.j2 b/templates/github/.github/workflows/release.yml.j2
index 3d9da798..6ad8ff68 100644
--- a/templates/github/.github/workflows/release.yml.j2
+++ b/templates/github/.github/workflows/release.yml.j2
@@ -254,8 +254,8 @@ jobs:
       - name: Cleanup repository before making changelog PR
         run: rm -rf .lock generation {{ plugin_snake }}_client* *-client.tar {{ plugin_name }}.tar todo web docs.tar
 
-      - name: Stage changelog for master branch
-        run: python .github/workflows/scripts/stage-changelog-for-master.py {{ "${{ github.event.inputs.release }}" }}
+      - name: Stage changelog for {{ plugin_default_branch }} branch
+        run: python .github/workflows/scripts/stage-changelog-for-default-branch.py {{ "${{ github.event.inputs.release }}" }}
 
       - name: Create Pull Request for Changelog
         uses: peter-evans/create-pull-request@v3
diff --git a/templates/github/.github/workflows/scripts/stage-changelog-for-master.py.j2 b/templates/github/.github/workflows/scripts/stage-changelog-for-default-branch.py.j2
similarity index 98%
rename from templates/github/.github/workflows/scripts/stage-changelog-for-master.py.j2
rename to templates/github/.github/workflows/scripts/stage-changelog-for-default-branch.py.j2
index c892067a..29c769dd 100644
--- a/templates/github/.github/workflows/scripts/stage-changelog-for-master.py.j2
+++ b/templates/github/.github/workflows/scripts/stage-changelog-for-default-branch.py.j2
@@ -13,7 +13,7 @@ helper = textwrap.dedent(
         Stage the changelog for a release on {{ plugin_default_branch }} branch.
 
         Example:
-            $ python .github/workflows/scripts/stage-changelog-for-master.py 3.4.0
+            $ python .github/workflows/scripts/stage-changelog-for-default-branch.py 3.4.0
 
     """
 )