#131 release-notes.md now in a separate branch - testing

vaadin-miki · Jun 16, 2020 · f026999 · f026999
1 parent 8364e92
commit f026999
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 20 deletions.
diff --git a/.github/workflows/releasebranch.yml b/.github/workflows/releasebranch.yml
@@ -13,7 +13,51 @@ jobs:
         run: |
           set -x
           echo "::set-output name=version::`echo '${{ github.event.milestone.title }}' | cut -d' ' -f1`"
-      - name: Push release branch
+      - 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.what-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
+          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.what-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 }}
+      - name: Create release branch
         uses: UnforgivenPL/push-branch@v2
         with:
           repository: ${{ github.repository }}

diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -30,28 +30,10 @@ jobs:
           mvn versions:set -DnewVersion=$VERSION --file pom.xml
           mvn versions:set -DnewVersion=$VERSION --file superfields/pom.xml
           sed -i -e s/{VERSION}/$VERSION/g ./README.md
-      - name: Create milestone notes
-        uses: UnforgivenPL/milestone-notes@v1
-        with:
-          match-milestone: "^${{ steps.what-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
-          mv superfields/release-notes.md.new superfields/release-notes.md
-      - name: Remove milestone notes
-        run: rm milestone-notes.md
       - name: Push changes
         uses: stefanzweifel/git-auto-commit-action@v4.1.6
         with:
-          commit_message: "(bot) version and release notes updated to ${{ steps.what-version.outputs.version }}"
+          commit_message: "(bot) version updated to ${{ steps.what-version.outputs.version }}"
           branch: ${{ github.event.ref }}
       - name: Resolve conflicts (keep ours)
         run: |

diff --git a/.github/workflows/test-release-notes.yml b/.github/workflows/test-release-notes.yml
@@ -0,0 +1,58 @@
+name: TEST Release branch on milestone close
+
+on:
+  push:
+    branches: [131-conflict-resolving]
+
+jobs:
+  make-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - id: version
+        run: |
+          set -x
+          echo "::set-output name=version::0.7.0"
+      - name: Push milestone notes branch
+        uses: UnforgivenPL/push-branch@v2
+        with:
+          repository: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          source: 131-conflict-resolving
+          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.what-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
+          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.what-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 131-conflict-resolving
+          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 }}
diff --git a/superfields/release-notes.md b/superfields/release-notes.md
@@ -1,3 +1,18 @@
+# 0.6.2 - Vaadin 14.2 compatibility
+## New features and enhancements
+* \#124 - [Update Vaadin dependencies to 14.2](https://api.github.com/repos/vaadin-miki/super-fields/issues/124)
+## Changes to API
+* \#127 - [WithIdMixin is missing from number fields](https://api.github.com/repos/vaadin-miki/super-fields/issues/127)
+## Bug fixes
+* \#126 - [Number fields cannot be easily styled](https://api.github.com/repos/vaadin-miki/super-fields/issues/126)
+* \#127 - [WithIdMixin is missing from number fields](https://api.github.com/repos/vaadin-miki/super-fields/issues/127)
+# 0.6.1 - Release process improvement
+## New features and enhancements
+* \#107 - [Generate release notes from a milestone](https://api.github.com/repos/vaadin-miki/super-fields/issues/107)
+## Changes to API
+(nothing reported)
+## Bug fixes
+* \#105 - [Removing date (time) picker and adding it back in the dom resets the display pattern](https://api.github.com/repos/vaadin-miki/super-fields/issues/105)
 # 0.6 - ComponentObserver and UnloadObserver
 ## New features and enhancements
 * \#66 - [A field that changes value on becoming shown and hidden](https://api.github.com/repos/vaadin-miki/super-fields/issues/66)