#131 using separate step with PR for notes (with automatic merge) (#165)

hopefully this means the end of #131 and semi-automated releases are good to go
vaadin-miki · Jun 17, 2020 · 89c6bd3 · 89c6bd3
1 parent f9d1431
commit 89c6bd3
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 51 deletions.
diff --git a/.github/workflows/releasebranch.yml b/.github/workflows/releasebranch.yml
@@ -1,63 +1,21 @@
-name: Prepare release branch on milestone close
+name: Merge release notes, create release branch
 
 on:
-  milestone:
-    types: [closed]
+  check_suite:
+    types: [completed]
 
 jobs:
-  make-branch:
+  make-release-branch:
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.event.milestone.title, '0.') || startsWith(github.event.milestone.title, '1.') || startsWith(github.event.milestone.title, '2.') || startsWith(github.event.milestone.title, '3.') || startsWith(github.event.milestone.title, '4.') || startsWith(github.event.milestone.title, '5.') || startsWith(github.event.milestone.title, '6.') || startsWith(github.event.milestone.title, '7.') || startsWith(github.event.milestone.title, '8.') || startsWith(github.event.milestone.title, '9.') }}
+    if: ${{ github.event.check_suite[conclusion] == 'success' && startsWith(github.event.check_suite[head_branch], 'notes-') }}
     steps:
-      - id: version
-        run: |
-          set -x
-          echo "::set-output name=version::`echo '${{ github.event.milestone.title }}' | cut -d' ' -f1`"
-      - name: Push milestone notes branch
-        uses: UnforgivenPL/push-branch@v2
+      - name: Merge PR
+        uses: UnforgivenPL/merge-pr@v1
         with:
           repository: ${{ github.repository }}
           token: ${{ secrets.GITHUB_TOKEN }}
-          source: development
-          target: notes-${{ steps.version.outputs.version }}
-      - uses: actions/checkout@v2
-        with:
-          ref: notes-${{ steps.version.outputs.version }}
-      - name: Create milestone notes
-        uses: UnforgivenPL/milestone-notes@v1
-        with:
-          match-milestone: "^${{ steps.version.outputs.version }} "
-          repository: ${{ github.repository }}
-          labels: "enhancement, api, bug"
-      - name: Format milestone notes
-        run: |
-          sed -i -e "s/## enhancement/## New features and enhancements/g" milestone-notes.md
-          sed -i -e "s/## api/## Changes to API/g" milestone-notes.md
-          sed -i -e "s/## bug/## Bug fixes/g" milestone-notes.md
-          sed -i -e "s/^$/(nothing reported)/g" milestone-notes.md
-      - name: Update release notes
-        run: |
-          echo -e "\n" | cat milestone-notes.md - superfields/release-notes.md > superfields/release-notes.md.new
-          awk 'NF' superfields/release-notes.md.new
-          mv superfields/release-notes.md.new superfields/release-notes.md
-      - name: Remove milestone notes
-        run: rm milestone-notes.md
-      - name: Push changes to notes branch
-        uses: stefanzweifel/git-auto-commit-action@v4.1.6
-        with:
-          commit_message: "(bot) release notes updated for ${{ steps.version.outputs.version }}"
-          branch: notes-${{ steps.version.outputs.version }}
-      - name: Prepare merge and push it to development
-        run: |
-          set -x
-          git fetch
-          git checkout notes-${{ steps.version.outputs.version }}
-          git checkout development
-          git config user.email "${{ secrets.EMAIL }}"
-          git config user.name "Miki (bot)"
-          git merge notes-${{ steps.version.outputs.version }}
-          git push origin
-          git push -d origin notes-${{ steps.version.outputs.version }}
+          pr: ${{ github.event.check_suite[pull_requests][0].number }}
+          must-have-labels: release
       - name: Create release branch
         uses: UnforgivenPL/push-branch@v2
         with:

diff --git a/.github/workflows/releasenotes.yml b/.github/workflows/releasenotes.yml
@@ -0,0 +1,60 @@
+name: Prepare release notes when milestone closes
+
+on:
+  milestone:
+    types: [closed]
+
+jobs:
+  update-release-notes:
+    runs-on: ubuntu-latest
+    if: ${{ startsWith(github.event.milestone.title, '0.') || startsWith(github.event.milestone.title, '1.') || startsWith(github.event.milestone.title, '2.') || startsWith(github.event.milestone.title, '3.') || startsWith(github.event.milestone.title, '4.') || startsWith(github.event.milestone.title, '5.') || startsWith(github.event.milestone.title, '6.') || startsWith(github.event.milestone.title, '7.') || startsWith(github.event.milestone.title, '8.') || startsWith(github.event.milestone.title, '9.') }}
+    steps:
+      - id: version
+        run: |
+          set -x
+          echo "::set-output name=version::`echo '${{ github.event.milestone.title }}' | cut -d' ' -f1`"
+      - name: Push milestone notes branch
+        uses: UnforgivenPL/push-branch@v2
+        with:
+          repository: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          source: development
+          target: notes-${{ steps.version.outputs.version }}
+      - uses: actions/checkout@v2
+        with:
+          ref: notes-${{ steps.version.outputs.version }}
+      - name: Create milestone notes
+        uses: UnforgivenPL/milestone-notes@v1
+        with:
+          match-milestone: "^${{ steps.version.outputs.version }} "
+          repository: ${{ github.repository }}
+          labels: "enhancement, api, bug"
+      - name: Format milestone notes
+        run: |
+          sed -i -e "s/## enhancement/## New features and enhancements/g" milestone-notes.md
+          sed -i -e "s/## api/## Changes to API/g" milestone-notes.md
+          sed -i -e "s/## bug/## Bug fixes/g" milestone-notes.md
+          sed -i -e "s/^$/(nothing reported)/g" milestone-notes.md
+      - name: Update release notes
+        run: |
+          echo -e "\n" | cat milestone-notes.md - superfields/release-notes.md > superfields/release-notes.md.new
+          awk 'NF' superfields/release-notes.md.new
+          mv superfields/release-notes.md.new superfields/release-notes.md
+      - name: Remove milestone notes
+        run: rm milestone-notes.md
+      - name: Push changes to notes branch
+        uses: stefanzweifel/git-auto-commit-action@v4.1.6
+        with:
+          commit_message: "(bot) release notes updated for ${{ steps.version.outputs.version }}"
+          branch: notes-${{ steps.version.outputs.version }}
+      - name: Create PR
+        uses: UnforgivenPL/pull-request@v1
+        with:
+          source: notes-${{ steps.version.outputs.version }}
+          target: development
+          repository: ${{ github.repository }}
+          token: ${{ secrets.ACTIONS_PAT }}
+          pr-title: Release notes for version ${{ steps.what-version.outputs.version }}
+          pr-body: Automatically updated notes ${{ steps.what-version.outputs.version }}.
+          pr-assignees: ${{ github.actor }}
+          pr-labels: release