Make the stage-changelog file agnostic to a default branch

closes #526
pulp · Nov 30, 2021 · b86dbd0 · b86dbd0
1 parent 581012c
commit b86dbd0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES/526.bugfix b/CHANGES/526.bugfix
@@ -0,0 +1 @@
+Made the file for staging changelogs branch agnostic.
diff --git 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
@@ -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/.../scripts/stage-changelog-for-master.py.j2 → .../stage-changelog-for-default-branch.py.j2 b/.../scripts/stage-changelog-for-master.py.j2 → .../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
 
     """
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Made the file for staging changelogs branch agnostic.