Merge pull request #31 from xdev-software/develop

1.0.5 - Updated dependencies

Author: AB-xdev

.github/workflows/develop.yml

@@ -46,3 +46,10 @@ jobs:
           echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean package -Pproduction"
           exit 1
         fi
+
+    - name: Upload demo files
+      uses: actions/upload-artifact@v2
+      with:
+        name: demo-files
+        path: vaadin-maps-leaflet-flow-demo/target/vaadin-maps-leaflet-flow-demo.war
+        if-no-files-found: error

.github/workflows/master.yml

@@ -5,9 +5,50 @@ on:
     branches: [ master ]
 
 jobs:
-  prepare_release:
+  check_code: # Validates the code (see develop.yml)
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
 
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+      
+    - name: Build with Maven
+      run: mvn -B clean package -Pproduction
+      
+    - name: Check for uncommited changes
+      run: |
+        if [[ "$(git status --porcelain)" != "" ]]; then
+          echo ----------------------------------------
+          echo git status
+          echo ----------------------------------------
+          git status
+          echo ----------------------------------------
+          echo git diff
+          echo ----------------------------------------
+          git diff
+          echo ----------------------------------------
+          echo Troubleshooting
+          echo ----------------------------------------
+          echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && mvn -B clean package -Pproduction"
+          exit 1
+        fi
+
+  prepare_release:
+    runs-on: ubuntu-latest
+    needs: [check_code]
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
     - uses: actions/checkout@v2
 
@@ -49,6 +90,7 @@ jobs:
       with:
         tag_name: v${{ steps.version.outputs.release }}
         release_name: v${{ steps.version.outputs.release }}
+        commitish: master
         body: |
           ## Installation
           Add the following lines to your pom:
@@ -62,17 +104,6 @@ jobs:
         draft: false
         prerelease: false
 
-    - name: Save Release Asset Upload URL to File
-      shell: bash
-      run: |
-        echo '${{ steps.create_release.outputs.upload_url }}' > release_asset_upload_url.txt
-
-    - name: Upload Release Asset Upload URL
-      uses: actions/upload-artifact@v2
-      with:
-        name: release_asset_upload_url
-        path: release_asset_upload_url.txt
-
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
     needs: [prepare_release]
@@ -96,7 +127,7 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
     - name: Publish to Apache Maven Central
-      run: mvn deploy -Possrh
+      run: mvn -B deploy -Possrh
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
@@ -131,16 +162,6 @@ jobs:
         path: vaadin-maps-leaflet-flow/target/vaadin-maps-leaflet-flow-*.zip
         if-no-files-found: error
 
-    - name: Download Release Asset Upload URL
-      uses: actions/download-artifact@v2
-      with:
-        name: release_asset_upload_url
-        path: temp_artf/release_asset_upload_url
-
-    - name: Fake steps.create_release.outputs.upload_url from predecessor
-      id: create_release
-      run: echo "::set-output name=upload_url::$(cat temp_artf/release_asset_upload_url/release_asset_upload_url.txt)"
-
     - name: Get version
       id: version
       run: |
@@ -152,15 +173,15 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        upload_url: ${{ needs.prepare_release.outputs.upload_url }}
         asset_path: vaadin-maps-leaflet-flow/target/vaadin-maps-leaflet-flow-${{ steps.version.outputs.release }}.zip
         asset_name: vaadin-maps-leaflet-flow-${{ steps.version.outputs.release }}.zip
         asset_content_type: application/zip
 
-  publish-pages: # Update online reference for dependencies and licenses
+  publish-pages:
     name: Publish dependencies and licenses to github pages
     runs-on: ubuntu-latest
-    
+    needs: [prepare_release]
     steps:
     - uses: actions/checkout@v2
 

README.md

@@ -29,7 +29,6 @@ If the ``develop`` is ready for release, create a pull request to the ``master``
 
 When the release is finished do the following:
 * Merge the auto-generated PR (with the incremented version number) back into the ``develop``
-* Log into https://oss.sonatype.org/#stagingRepositories and close + release the staging deployment<br/>See also [this guide](https://central.sonatype.org/pages/releasing-the-deployment.html)
 * Add the release notes to the [GitHub release](https://github.com/xdev-software/vaadin-maps-leaflet-flow/releases/latest)
 * Upload the generated release asset zip into the [Vaadin Directory](https://vaadin.com/directory)