Merge pull request #27 from whelk-io/develop

Develop

.github/workflows/deploy.yml

@@ -11,18 +11,22 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
     - name: Parse Version from POM
       shell: bash
       run: | 
         cat pom.xml | grep version -m 2 | tail -1 | awk '{$1=$1};1' | awk -F'>' '{print $2}' | awk -F'<' '{print $1}' > /tmp/version.txt
+        
     - name: Print version
       shell: bash
       run: |
         version=`cat /tmp/version.txt` && echo Deploying $version
+
     - name: Release package
       run: |
         version=`cat /tmp/version.txt` &&
@@ -32,13 +36,29 @@ jobs:
           -H 'Content-Type: application/json' \
           -H 'Host: api.github.com' \
           -d '{ "tag_name": "'$version'", "target_commitish": "master", "name": "'$version'", "body": "Release deployment", "draft": false, "prerelease": false }'
+
     - name: Create Maven settings.xml
       uses: s4u/maven-settings-action@v1
       with:
         servers: '[{"id": "github", "username": "${{ secrets.PACKAGE_KEY }}", "password": "${{ secrets.PACKAGE_TOKEN }}"}]'  
+
     - name: Deploy package
       run: mvn -B deploy --file pom.xml
-
-
-
+
+    - name: Checkout develop branch
+      uses: actions/checkout@master
+      with:
+        branch: develop
+
+    - name: Merge master to develop
+      run: |
+        git config --local user.email ${{ secrets.BUILD_EMAIL }}
+        git config --local user.name ${{ secrets.BUILD_USERNAME }}
+        git pull
+        git merge origin/master
+    - name: Push changes
+      uses: ad-m/github-push-action@master
+      with:
+        branch: develop
+        github_token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/release.yml

@@ -28,19 +28,14 @@ jobs:
     - name: Increment version in pom.xml
       run: |
         old_version=`cat /tmp/release.json | grep tag_name -m 1 | awk '{$1=$1};1' | awk -F':' '{print $2}' | awk -F'"' '{print $2}'` \
-        && echo $old_version \
+        && echo "Old version: " $old_version \
         && major_version=`echo $old_version | awk -F'-' '{print $1}' | awk -F'.' '{print $1}'` \
-        && echo $major_version \
         && minor_version=`echo $old_version | awk -F'-' '{print $1}' | awk -F'.' '{print $2}'` \
-        && echo $minor_version \
         && patch_version=`echo $old_version | awk -F'-' '{print $1}' | awk -F'.' '{print $3}'` \
-        && echo $patch_version \
         && let "patch_version+=1" \
-        && echo $patch_version \
         && new_version=$major_version"."$minor_version"."$patch_version"-RELEASE" \
-        && echo $new_version \
-        && mvn -B versions:set -DnewVersion=$new_version --file pom.xml \
-        && echo pom.xml
+        && echo "New version: " $new_version \
+        && mvn -B versions:set -DnewVersion=$new_version --file pom.xml
         
     - name: Commit files
       run: |

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>io.whelk.flesch.kincaid</groupId>
 	<artifactId>whelk-flesch-kincaid</artifactId>
-	<version>0.0.8-RELEASE</version>
+	<version>0.0.9-RELEASE</version>
 	<name>Flesch Kincaid</name>
 	<description>Java OSS library for performing Flesch-Kincaid readability tests.</description>
 	<url>https://github.com/whelk-io/flesch-kincaid</url>