Merge pull request #83 from Tompage1994/changelog_pr

Create a PR for changelog on release

Author: sean-m-sullivan

.github/workflow-config/release.yml

@@ -41,21 +41,6 @@
         chdir: "{{ repo_base_dir }}"
       tags: publish
 
-    - name: Set git config
-      shell:
-        cmd: "git config user.name 'redhat-cop-ci-bot' && git config user.email 'action@github.com'"
-        chdir: "{{ repo_base_dir }}"
-
-    - name: push changelogs to devel
-      shell:
-        cmd: "git add changelogs CHANGELOG.rst && git commit -m 'add changelog {{ collection_version }}'"
-        chdir: "{{ repo_base_dir }}"
-
-    - name: git cleanup
-      command:
-        cmd: git reset --hard
-      tags: cleanup
-
     - name: remove galaxy.yml
       file:
         path: "{{ repo_base_dir }}/galaxy.yml"

.github/workflows/automerge-release.yml

@@ -0,0 +1,19 @@
+---
+name: Merge Bot
+
+on:
+  pull_request:
+    types:
+      - labeled
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    name: Merge
+    steps:
+    - name: Merge changelog automated PR
+      uses: squalrus/merge-bot@master
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        labels: changelog, automated pr
+        reviewers: false

.github/workflows/galaxy-release.yml

@@ -33,8 +33,26 @@ jobs:
           -e collection_repo=https://github.com/${{ github.repository }}
           --skip-tags=install,cleanup
 
-      - name: Push changes
-        uses: ad-m/github-push-action@master
+      - name: Create Pull Request
+        id: prcreate
+        uses: peter-evans/create-pull-request@v3
         with:
-          branch: devel
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Update changelog ${{ github.ref }}
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          signoff: false
+          base: devel
+          branch: changelog-patches
+          delete-branch: true
+          title: '[RELEASE] Update changelog ${{ github.ref }}'
+          body: |
+            Update changelog
+            - Updated with changelog for release ${{ github.ref }}
+            - Auto-generated by [create-pull-request][1]
+
+            [1]: https://github.com/peter-evans/create-pull-request
+          labels: |
+            changelog
+            automated pr
+          draft: false

.gitignore

@@ -1,2 +1,4 @@
 collections/*
 !collections/requirements.yml
+galaxy.yml
+*.tar.gz

changelogs/fragments/changelogs.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - Changelog release cycle