Update publish script

Author: pmendelski

.github/workflows/build.yml

@@ -18,8 +18,7 @@ jobs:
         id: versions
         shell: bash
         run: |
-          declare -r VERSION="$((git describe --abbrev=0 --tags --match 'v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null || echo "v0.0.0") \
-            | cut -c2-)"
+          declare -r VERSION="$((git describe --abbrev=0 --tags --match 'v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null || echo "v0.0.0") | cut -c2-)"
           declare -r MAJOR="$(echo "$VERSION" | cut -d. -f1)"
           declare -r MINOR="$(echo "$VERSION" | cut -d. -f2)"
           declare -r PATCH="$(echo "$VERSION" | cut -d. -f3)"
@@ -60,7 +59,3 @@ jobs:
           tag: v${{ steps.versions.outputs.next_version }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Publish snapshot to maven central
-        if: "github.ref == 'refs/heads/master'"
-        shell: bash
-        run: echo ">>> Publish Snapshot ${{ steps.versions.outputs.next_version }}-SNAPSHOT"

.github/workflows/publish.yml

@@ -25,6 +25,15 @@ jobs:
           java-version: 11
           distribution: temurin
 
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
       - name: Publish release
         if: startsWith(github.ref, 'refs/tags/v')
         env:
@@ -44,10 +53,11 @@ jobs:
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
         run: |
-          declare -r VERSION="$(git describe --abbrev=0 --tags --match 'v[0-9]*' 2>/dev/null || echo "v0.0.0" | cut -c2-)"
+          declare -r VERSION="$((git describe --abbrev=0 --tags --match 'v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null || echo "v0.0.0") | cut -c2-)"
           declare -r MAJOR="$(echo "$VERSION" | cut -d. -f1)"
           declare -r MINOR="$(echo "$VERSION" | cut -d. -f2)"
           declare -r PATCH="$(echo "$VERSION" | cut -d. -f3)"
           declare -r NEXT_VERSION="$MAJOR.$MINOR.$(( $PATCH + 1 ))"
-          ./gradlew publishToSonatype -Pversion="${NEXT_VERSION}-${GITHUB_REF#refs/heads/}-SNAPSHOT" -Ppublish
-          echo "Published snapshot: ${NEXT_VERSION}-${GITHUB_REF#refs/heads/}-SNAPSHOT"
+          declare -r MIDDLE="$([ "$GITHUB_REF" == "refs/heads/master" ] && echo "" || echo "-${GITHUB_REF#refs/heads/}")"
+          ./gradlew publishToSonatype -Pversion="${NEXT_VERSION}${MIDDLE}-SNAPSHOT" -Ppublish
+          echo "Published snapshot: ${NEXT_VERSION}${MIDDLE}-SNAPSHOT"