Release 0.7.0 ready (#169)

done #100 #105 #108 #107 #111 #113 #115 #117 #119 #22 #124 #126 #127 #129 #132 #122 #136 #137 #123 #141 #139 #143 #135 #146 #147 #152 #154 #131 #171
vaadin-miki · Jun 22, 2020 · be67db6 · be67db6
1 parent 511d16e
commit be67db6
Show file tree

Hide file tree

Showing 54 changed files with 1,580 additions and 139 deletions.
diff --git a/.github/workflows/makerelease.yml b/.github/workflows/makerelease.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Create Release
         uses: fleskesvor/create-release@feature/support-target-commitish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.ACTIONS_PAT }}
         with:
           tag_name: "v${{ steps.variables.outputs.version }}"
           commitish: "master"

diff --git a/.github/workflows/releasebranch.yml b/.github/workflows/releasebranch.yml
@@ -1,19 +1,28 @@
-name: Release branch on milestone close
+name: Merge release notes, create release branch
 
 on:
-  milestone:
-    types: [closed]
+  pull_request:
+    types: [opened]
 
 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: ${{ startsWith(github.event.pull_request.title, 'Release notes for version') && startsWith(github.event.pull_request.head.ref, 'notes-') }}
+    timeout-minutes: 30
     steps:
       - id: version
         run: |
           set -x
-          echo "::set-output name=version::`echo '${{ github.event.milestone.title }}' | cut -d' ' -f1`"
-      - name: Push release branch
+          echo "::set-output name=version::`echo '${{ github.event.pull_request.head.ref }}' | cut -d'-' -f2`"
+      - name: Merge PR
+        uses: UnforgivenPL/merge-pr@v2
+        with:
+          repository: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          pr: ${{ github.event.number }}
+          delay: 300
+          must-have-labels: release
+      - name: Create release branch
         uses: UnforgivenPL/push-branch@v2
         with:
           repository: ${{ github.repository }}

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
diff --git a/.github/workflows/setversion.yml b/.github/workflows/setversion.yml
@@ -9,6 +9,8 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Set up JDK 10
         uses: actions/setup-java@v1
         with:
@@ -28,29 +30,21 @@ 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: |
+          set -x
+          git fetch
+          git checkout master
+          git checkout ${{ github.event.ref }}
+          git config user.email "${{ secrets.EMAIL }}"
+          git config user.name "Miki (bot)"
+          git merge master --strategy=ours
+          git push origin
       - name: Create PR
         uses: UnforgivenPL/pull-request@v1
         with:

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ This is the relevant dependency:
 <dependency>
    <groupId>org.vaadin.miki</groupId>
    <artifactId>superfields</artifactId>
-   <version>0.6.2</version>
+   <version>0.7.0</version>
 </dependency>
 ```
 

diff --git a/demo-v14/frontend/styles/demo-styles.css b/demo-v14/frontend/styles/demo-styles.css
@@ -17,7 +17,7 @@ p.selected-tab {
     background: #2b908f;
     font-weight: bold;
     border: 3px solid darkblue;
-    padding: 0px;
+    padding: 0;
 }
 
 div.item-grid-cell {
@@ -42,4 +42,26 @@ span.highlighted {
     font-style: italic;
     letter-spacing: 1px;
     color: #004444;
-}
+}
+
+.section-layout {
+    padding-top: 1em;
+    padding-bottom: 1em;
+    margin-top: 1em;
+}
+
+.section-header {
+    font-size: larger;
+    text-align: center;
+    font-weight: bold;
+    letter-spacing: 1px;
+}
+
+.component-header {
+    text-align: left;
+}
+
+.component-section {
+    padding: 1em;
+    margin: 1em;
+}
diff --git a/demo-v14/frontend/styles/super-tabs-styles.css b/demo-v14/frontend/styles/super-tabs-styles.css
@@ -0,0 +1,3 @@
+:host(#belongs-to-super-tabs) [part="tabs"] {
+    width: 400px;
+}
diff --git a/demo-v14/package-lock.json b/demo-v14/package-lock.json
diff --git a/demo-v14/pom.xml b/demo-v14/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>superfields-parent</artifactId>
         <groupId>org.vaadin.miki</groupId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>superfields-demo-v14</artifactId>
-    <version>0.6.2</version>
+    <version>0.7.0</version>
     <name>V14 demo app for SuperFields</name>
     <description>Showcase application for V14 and SuperFields.</description>
     <packaging>war</packaging>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.vaadin.miki</groupId>
             <artifactId>superfields</artifactId>
-            <version>0.6.2</version>
+            <version>0.7.0</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/demo-v14/src/main/java/org/vaadin/miki/InfoPage.java b/demo-v14/src/main/java/org/vaadin/miki/InfoPage.java
@@ -0,0 +1,27 @@
+package org.vaadin.miki;
+
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+
+/**
+ * Information about the demo, its organisation and components.
+ * @author miki
+ * @since 2020-06-03
+ */
+public class InfoPage extends VerticalLayout {
+
+    public InfoPage() {
+        super(
+            new Span("Hello and welcome to SuperFields demo! Thank you for your interest in this little project, I hope you find it useful."),
+            new Span("The components shown in this demo are available in SuperFields, a small collection of handy stuff designed to work with Vaadin 14 and Java."),
+            new Span("To see a component in action simply select a corresponding tab from above. Each page features the chosen component at the top, followed by (some of) the configurable options."),
+            new Span("Bottom left corner of the browser window will show major notifications from each component - like value change notifications. Bottom right corner is reserved for secondary notifications, e.g. focus and blur events."),
+            new Anchor("https://github.com/vaadin-miki/super-fields", "More information can be found on the project's main page on GitHub."),
+            new Anchor("https://github.com/vaadin-miki/super-fields/issues", "Please use GitHub to report issues and request features and components."),
+            new Anchor("https://vaadin.com/directory/component/superfields", "If you find this library useful, please consider sparing a moment and writing a comment or leaving a rating in the Vaadin Directory. Thank you!"),
+            new Span("Disclaimer: unless otherwise noted, all code has been written by me (Miki) and is released under Apache 2.0 License. This library is not officially supported or endorsed by Vaadin and is not part of the Vaadin Platform.")
+        );
+    }
+
+}