YOLO attempt CI script fix by close and releasing in same gradle invocation.

Author: sshropshire

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
         run: ./ci unit_tests
 
   # Publish after successful build and unit tests
-  publish_to_sonatype:
+  publish_browser_switch:
     needs: [ build_aar, unit_test_browser_switch ]
     name: Publish To Sonatype
     runs-on: ubuntu-latest
@@ -55,22 +55,15 @@ jobs:
       - name: Update Version
         run: ./ci update_version ${{ github.event.inputs.version }}
       - name: Publish Browser Switch
-        run: ./ci publish_to_sonatype
-        env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      - name: Close and Release Repository
-        run: ./ci close_and_release_repository
+        run: ./ci publish release
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
 
   release_finished:
-    needs: [ publish_to_sonatype ]
+    needs: [ publish_browser_switch ]
     name: Release Finished
     runs-on: ubuntu-latest
     steps:

.github/workflows/release_snapshot.yml

@@ -37,8 +37,7 @@ jobs:
       - name: Run Unit Tests
         run: ./ci unit_tests
 
-  # Publish SNAPSHOT after successful build and unit tests
-  publish_snapshot_to_sonatype:
+  publish_browser_switch_snapshot:
     needs: [ build_aar, unit_test_browser_switch ]
     name: Publish SNAPSHOT
     runs-on: ubuntu-latest
@@ -52,15 +51,15 @@ jobs:
         env:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
       - name: Publish SNAPSHOT to Sonatype
-        run: ./ci publish_to_sonatype
+        run: ./ci publish snapshot
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
 
   release_finished:
-    needs: [ publish_snapshot_to_sonatype ]
+    needs: [ publish_browser_switch_snapshot ]
     name: Release Finished
     runs-on: ubuntu-latest
     steps:

ci

@@ -42,19 +42,22 @@ case $command_name in
   increment_demo_app_version_code)
     ./gradlew incrementVersionCode
     ;;
-  publish_to_sonatype)
+  publish)
     # Ref: https://nickjanetakis.com/blog/prevent-unset-variables-in-your-shell-bash-scripts-with-set-nounset
     [ -n "${SONATYPE_USERNAME}" ]    || (echo "::error:: SONATYPE_USERNAME env variable not set" && exit 1)
     [ -n "${SONATYPE_PASSWORD}" ]    || (echo "::error:: SONATYPE_PASSWORD env variable not set" && exit 1)
     [ -n "${SIGNING_KEY_ID}" ]       || (echo "::error:: SIGNING_KEY_ID env variable not set" && exit 1)
     [ -n "${SIGNING_KEY_PASSWORD}" ] || (echo "::error:: SIGNING_KEY_PASSWORD env variable not set" && exit 1)
     [ -n "${SIGNING_KEY_FILE}" ]     || (echo "::error:: SIGNING_KEY_FILE env variable not set" && exit 1)
 
-    # publish to sonatype
-    ./gradlew clean :browser-switch:publishToSonatype
-    ;;
-  close_and_release_repository)
-    ./gradlew --stacktrace closeAndReleaseSonatypeStagingRepository
+    release_type="$2"
+    if [ "${release_type}" == "release" ]; then
+      # publish release
+      ./gradlew --stacktrace clean :browser-switch:publishToSonatype closeAndReleaseSonatypeStagingRepository
+    else
+      # publish SNAPSHOT
+      ./gradlew --stacktrace clean :browser-switch:publishToSonatype
+    fi
     ;;
   decode_signing_key)
     [ -n "${SIGNING_KEY}" ]      || (echo "::error:: SIGNING_KEY env variable not set" && exit 1)