Skip to content

Commit 916340e

Browse files
AB-xdevAB-xdev
authored
Merge pull request #18 from xdev-software/develop
Release 1.0.2
2 parents 6030808 + 92c183d commit 916340e

File tree

4 files changed

+154
-18
lines changed

4 files changed

+154
-18
lines changed

‎.github/workflows/master.yml

Lines changed: 150 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,90 @@
11
name: Master CI
22

33
on:
4-
workflow_dispatch:
5-
# push:
6-
# branches: [ master ]
4+
push:
5+
branches: [ master ]
76

87
jobs:
9-
publish_central:
8+
prepare_release:
109
runs-on: ubuntu-latest
1110

1211
steps:
1312
- uses: actions/checkout@v2
13+
14+
- name: Configure Git
15+
run: |
16+
git config --global user.email "[email protected]"
17+
git config --global user.name "GitHub Actions"
18+
19+
- name: Un-SNAP root
20+
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
21+
22+
- name: Un-SNAP demo
23+
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
24+
working-directory: vaadin-date-range-picker-demo
25+
26+
- name: Un-SNAP
27+
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
28+
working-directory: vaadin-date-range-picker
29+
30+
- name: Get version
31+
id: version
32+
run: |
33+
echo "::set-output name=release::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
34+
working-directory: vaadin-date-range-picker
35+
36+
- name: Commit and Push
37+
run: |
38+
git add -A
39+
git commit -m "Release ${{ steps.version.outputs.release }}"
40+
git push origin
41+
git tag v${{ steps.version.outputs.release }}
42+
git push origin --tags
43+
44+
- name: Create Release
45+
id: create_release
46+
uses: actions/create-release@v1
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
with:
50+
tag_name: v${{ steps.version.outputs.release }}
51+
release_name: v${{ steps.version.outputs.release }}
52+
body: |
53+
## Installation
54+
Add the following lines to your pom:
55+
```XML
56+
<dependency>
57+
<groupId>com.xdev-software</groupId>
58+
<artifactId>vaadin-date-range-picker</artifactId>
59+
<version>${{ steps.version.outputs.release }}</version>
60+
</dependency>
61+
```
62+
draft: false
63+
prerelease: false
1464

65+
- name: Save Release Asset Upload URL to File
66+
shell: bash
67+
run: |
68+
echo '${{ steps.create_release.outputs.upload_url }}' > release_asset_upload_url.txt
69+
70+
- name: Upload Release Asset Upload URL
71+
uses: actions/upload-artifact@v2
72+
with:
73+
name: release_asset_upload_url
74+
path: release_asset_upload_url.txt
75+
76+
publish_central: # Publish the code to central
77+
runs-on: ubuntu-latest
78+
needs: [prepare_release]
79+
steps:
80+
- uses: actions/checkout@v2
81+
82+
- name: Init Git and pull
83+
run: |
84+
git config --global user.email "[email protected]"
85+
git config --global user.name "GitHub Actions"
86+
git pull
87+
1588
- name: Set up JDK 1.8 Apache Maven Central
1689
uses: actions/setup-java@v1
1790
with: # running setup-java again overwrites the settings.xml
@@ -30,19 +103,25 @@ jobs:
30103
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
31104
working-directory: vaadin-date-range-picker
32105

33-
build_directory:
106+
build_directory: # Build a ZIP that can be uploaded to Vaadin Directory
34107
runs-on: ubuntu-latest
35-
108+
needs: [prepare_release]
36109
steps:
37110
- uses: actions/checkout@v2
38111

112+
- name: Init Git and pull
113+
run: |
114+
git config --global user.email "[email protected]"
115+
git config --global user.name "GitHub Actions"
116+
git pull
117+
39118
- name: Set up JDK 1.8
40119
uses: actions/setup-java@v1
41120
with:
42121
java-version: 1.8
43122

44123
- name: Build for Vaadin Directory
45-
run: mvn install -Pdirectory
124+
run: mvn -B install -Pdirectory
46125
working-directory: vaadin-date-range-picker
47126

48127
- name: Upload asset
@@ -51,3 +130,67 @@ jobs:
51130
name: vaadin-directory-files
52131
path: vaadin-date-range-picker/target/vaadin-date-range-picker-*.zip
53132
if-no-files-found: error
133+
134+
- name: Download Release Asset Upload URL
135+
uses: actions/download-artifact@v1
136+
with:
137+
name: release_asset_upload_url
138+
path: temp_artf/release_asset_upload_url
139+
140+
- name: Fake steps.create_release.outputs.upload_url from predecessor
141+
id: create_release
142+
run: echo "::set-output name=upload_url::$(cat temp_artf/release_asset_upload_url/release_asset_upload_url.txt)"
143+
144+
- name: Get version
145+
id: version
146+
run: |
147+
echo "::set-output name=release::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
148+
working-directory: vaadin-date-range-picker
149+
150+
- name: Upload Release Asset
151+
uses: actions/upload-release-asset@v1
152+
env:
153+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
154+
with:
155+
upload_url: ${{ steps.create_release.outputs.upload_url }}
156+
asset_path: vaadin-date-range-picker/target/vaadin-date-range-picker-${{ steps.version.outputs.release }}.zip
157+
asset_name: vaadin-date-range-picker-${{ steps.version.outputs.release }}.zip
158+
asset_content_type: application/zip
159+
160+
after_release:
161+
runs-on: ubuntu-latest
162+
needs: [publish_central, build_directory]
163+
steps:
164+
- uses: actions/checkout@v2
165+
166+
- name: Init Git and pull
167+
run: |
168+
git config --global user.email "[email protected]"
169+
git config --global user.name "GitHub Actions"
170+
git pull
171+
172+
- name: Inc Version and SNAP root
173+
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
174+
175+
- name: Inc Version and SNAP demo
176+
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
177+
working-directory: vaadin-date-range-picker-demo
178+
179+
- name: Inc Version and SNAP
180+
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
181+
working-directory: vaadin-date-range-picker
182+
183+
- name: Git Commit and Push
184+
run: |
185+
git add -A
186+
git commit -m "Preparing for next development iteration"
187+
git push origin
188+
189+
- name: pull-request
190+
uses: repo-sync/pull-request@v2
191+
with:
192+
github_token: ${{ secrets.GITHUB_TOKEN }}
193+
destination_branch: "develop"
194+
pr_title: "Sync back"
195+
pr_body: "An automated PR to sync changes back"
196+

‎README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,7 @@ A Vaadin Flow DateRangePicker implementation
88
![demo](demo.png)
99

1010
## Installation
11-
Add the following lines to your pom:
12-
```XML
13-
<dependency>
14-
<groupId>com.xdev-software</groupId>
15-
<artifactId>vaadin-date-range-picker</artifactId>
16-
<version>1.0.1</version>
17-
</dependency>
18-
```
11+
[Installation guide of the latest release](https://github.com/xdev-software/vaadin-date-range-picker/releases/latest#Installation)
1912

2013
## Run the Demo
2114
* Checkout the repo

‎vaadin-date-range-picker/assembly/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Vaadin-Package-Version: 1
33
Vaadin-Addon: ${project.build.finalName}.${project.packaging}
44
Implementation-Vendor: ${organization.name}
55
Implementation-Title: ${project.name}
6-
Implementation-Version: ${project.version}
6+
Implementation-Version: ${project.version}

‎vaadin-date-range-picker/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<packaging>jar</packaging>
1212
<version>1.0.2-SNAPSHOT</version>
1313

14-
<name>Vaadin DateRangePicker</name>
15-
<description>Vaadin DateRangePicker</description>
14+
<name>DateRangePicker for Vaadin</name>
15+
<description>DateRangePicker for Vaadin</description>
1616
<url>https://github.com/xdev-software/vaadin-date-range-picker</url>
1717

1818
<scm>

0 commit comments

Comments
 (0)