Use new commit and push workflow

Author: cYKatherine

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 name: Release
+run-name: ${{ format('Release version {0}', inputs.version)}} by @${{ github.actor }}  
 
 on:
   workflow_dispatch:
@@ -11,6 +12,7 @@ on:
         description: 'Next SNAPSHOT version (without v). Defaults to current value'
         required: false
         type: string
+  pull_request:
 
 jobs:
   publish:
@@ -42,14 +44,47 @@ jobs:
           # Disable writing to cache. Don't want to spoil the main cache
           cache-read-only: true
 
-      - name: Release
-        run: ./scripts/release.sh ${{ inputs.version }} ${{ inputs.snapshot }}
+      - name: Get Snaptshot versions
+        id: snapshotVersions
+        run: ./scripts/get_next_snapshot_version.sh ${{ inputs.snapshot }}
+
+      - name: Prepare for release metadata
+        shell: bash
+        run: |
+          sed -i.bak "s/${{ steps.snapshotVersions.cur_snapshot_version }}/${{ steps.snapshotVersions.new_snapshot_version }}/g" gradle.properties
+
+      - name: Commit gradle.properties and set tag for v${{ inputs.version }}
+        uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2
+        with:
+          add: 'gradle.properties'
+          message: 'Prepare for release: ${{ inputs.version }}'
+          tag: v${{ inputs.version }}
+
+      - name: Deploy v${{ inputs.version }}
+        run: ./gradlew publish
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_REPO_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_REPO_PASSWORD }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_PASSPHRASE }}
 
+      - name: Prepare next Snapshot version ${{ steps.snapshotVersions.new_snapshot_version }}
+        shell: bash
+        run: |
+          echo "Setting next snapshot version ${{ steps.snapshotVersions.new_snapshot_version }}"
+          sed -i.bak "s/${{ inputs.version }}/${{ steps.snapshotVersions.new_snapshot_version }}/g" gradle.properties
+
+      - name: Commit gradle.properties for Snapshot version ${{ steps.snapshotVersions.new_snapshot_version }}
+        uses: IABTechLab/uid2-shared-actions/actions/commit_pr_and_merge@v2
+        with:
+          add: 'gradle.properties'
+          message: 'Prepare next development version: ${{ steps.snapshotVersions.new_snapshot_version }}'
+
+      - name: Remove the backup file from sed edits
+        shell: bash
+        run: |
+          rm gradle.properties.bak
+
       - name: GitHub Release
         uses: softprops/action-gh-release@v1
         with:

scripts/get_snapshot_versions.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+# Gets a property out of a .properties file
+# usage: getProperty $key $filename
+function getProperty() {
+    grep "${1}" "$2" | cut -d'=' -f2
+}
+
+NEW_SNAPSHOT_VERSION=$1
+CUR_SNAPSHOT_VERSION=$(getProperty 'VERSION_NAME' gradle.properties)
+
+if [ -z "$NEW_SNAPSHOT_VERSION" ]; then
+  # If no snapshot version was provided, use the current value
+  NEW_SNAPSHOT_VERSION=$CUR_SNAPSHOT_VERSION
+fi
+
+
+echo "new_snapshot_version=$NEW_SNAPSHOT_VERSION" >> $GITHUB_OUTPUT
+echo "cur_snapshot_version=$CUR_SNAPSHOT_VERSION" >> $GITHUB_OUTPUT

scripts/prepare_next_snapshot_version.sh

@@ -0,0 +1,4 @@
+
+# Prepare next snapshot
+echo "Setting next snapshot version $NEW_SNAPSHOT_VERSION"
+sed -i.bak "s/${NEW_VERSION}/${NEW_SNAPSHOT_VERSION}/g" gradle.properties

scripts/release.sh

@@ -10,12 +10,7 @@ function getProperty() {
 
 NEW_VERSION=$1
 NEW_SNAPSHOT_VERSION=$2
-CUR_SNAPSHOT_VERSION=$(getProperty 'VERSION_NAME' gradle.properties)
-
-if [ -z "$NEW_SNAPSHOT_VERSION" ]; then
-  # If no snapshot version was provided, use the current value
-  NEW_SNAPSHOT_VERSION=$CUR_SNAPSHOT_VERSION
-fi
+CUR_SNAPSHOT_VERSION=$3
 
 echo "Publishing $NEW_VERSION"