diff --git a/.github/workflows/releasebranch.yml b/.github/workflows/releasebranch.yml index ed39bb60..0fd31822 100644 --- a/.github/workflows/releasebranch.yml +++ b/.github/workflows/releasebranch.yml @@ -1,4 +1,4 @@ -name: Release branch on milestone close +name: Prepare release branch on milestone close on: milestone: @@ -38,6 +38,7 @@ jobs: - 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 diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml index bcb6acf2..8391fc15 100644 --- a/.github/workflows/setversion.yml +++ b/.github/workflows/setversion.yml @@ -45,13 +45,13 @@ jobs: git config user.name "Miki (bot)" git merge master --strategy=ours git push origin -# - name: Create PR -# uses: UnforgivenPL/pull-request@v1 -# with: -# source: ${{ github.event.ref }} -# target: master -# repository: ${{ github.repository }} -# token: ${{ secrets.ACTIONS_PAT }} -# pr-title: Release ${{ steps.what-version.outputs.version }} ready -# pr-body: Automatically created release ${{ steps.what-version.outputs.version }}. -# pr-assignees: ${{ github.actor }} + - name: Create PR + uses: UnforgivenPL/pull-request@v1 + with: + source: ${{ github.event.ref }} + target: master + repository: ${{ github.repository }} + token: ${{ secrets.ACTIONS_PAT }} + pr-title: Release ${{ steps.what-version.outputs.version }} ready + pr-body: Automatically created release ${{ steps.what-version.outputs.version }}. + pr-assignees: ${{ github.actor }} diff --git a/.github/workflows/test-release-notes.yml b/.github/workflows/test-release-notes.yml deleted file mode 100644 index 9562fd2c..00000000 --- a/.github/workflows/test-release-notes.yml +++ /dev/null @@ -1,58 +0,0 @@ -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.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.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 index 1297a365..32a03984 100644 --- a/superfields/release-notes.md +++ b/superfields/release-notes.md @@ -1,20 +1,3 @@ -# 0.7.0 - SuperTextField -## New features and enhancements -* \#122 - [SuperTextField, SuperTextArea and text selection API](https://api.github.com/repos/vaadin-miki/super-fields/issues/122) -* \#123 - [Add text selection API to existing components](https://api.github.com/repos/vaadin-miki/super-fields/issues/123) -* \#135 - [SuperTabs should have an option to wrap tabs](https://api.github.com/repos/vaadin-miki/super-fields/issues/135) -* \#141 - [Server-side date formatting for DatePattern](https://api.github.com/repos/vaadin-miki/super-fields/issues/141) -* \#152 - [Allow overriding default value in number fields](https://api.github.com/repos/vaadin-miki/super-fields/issues/152) -## Changes to API -* \#123 - [Add text selection API to existing components](https://api.github.com/repos/vaadin-miki/super-fields/issues/123) -* \#147 - [HasId marker interface](https://api.github.com/repos/vaadin-miki/super-fields/issues/147) -## Bug fixes -* \#132 - [No deployment to Heroku](https://api.github.com/repos/vaadin-miki/super-fields/issues/132) -* \#136 - [setReadOnly has no effect on number fields](https://api.github.com/repos/vaadin-miki/super-fields/issues/136) -* \#137 - [UnloadObserver.onDetach causes TypeError](https://api.github.com/repos/vaadin-miki/super-fields/issues/137) -* \#146 - [SuperTabs are difficult to style](https://api.github.com/repos/vaadin-miki/super-fields/issues/146) -* \#154 - [Number fields do not trigger focus/blur events](https://api.github.com/repos/vaadin-miki/super-fields/issues/154) - # 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)