From a98028a46555b2de8099cc66bdad541c391f8bc7 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Mon, 21 Jun 2021 17:38:52 +0100
Subject: [PATCH] Improve release script and workflows.

---
 .github/workflows/beta.yml    |  2 +-
 .github/workflows/release.yml | 17 ++++++++++++++++-
 bin/release-binary.sh         | 23 ++++++++++++-----------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index abe73c2f2..092eb3dcb 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -38,4 +38,4 @@ jobs:
           MONGO_USERNAME: ${{ secrets.MONGO_USERNAME }}
           MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
           SHORT_HASH: ${{ steps.var.outputs.sha_short }}
-        run: bin/release-binary.sh "master" "$SHORT_HASH" "$MONGO_URL" "$MONGO_USERNAME" "$MONGO_PASSWORD"
\ No newline at end of file
+        run: bin/release-binary.sh "$MONGO_URL" "$MONGO_USERNAME" "$MONGO_PASSWORD" "$SHORT_HASH" "master"
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1c09ff8cf..76e3deaa6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,14 @@ on:
     - '*'
 jobs:
   build:
+    name: "Stable Release"
     runs-on: ubuntu-latest
+    environment: production
+    services:
+      mongodb:
+        image: mongo:3.2
+        ports:
+          - 27017:27017
     steps:
     - uses: actions/checkout@v2
     - name: Run tests
@@ -15,7 +22,15 @@ jobs:
       run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
     - name: Build artifacts
       run: ./gradlew -Penv=production -Prelease=${{ steps.var.outputs.tag }} clean assemble
-    - uses: ncipollo/release-action@v1
+    - name: Release
+      uses: ncipollo/release-action@v1
       with:
         artifacts: "build/distributions/sdkman-cli-*.zip"
         token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Update MongoDB
+      env:
+        MONGO_URL: ${{ secrets.MONGO_URL }}
+        MONGO_USERNAME: ${{ secrets.MONGO_USERNAME }}
+        MONGO_PASSWORD: ${{ secrets.MONGO_PASSWORD }}
+        RELEASE_TAG: ${{ steps.var.outputs.tag }}
+      run: bin/release-binary.sh "$MONGO_URL" "$MONGO_USERNAME" "$MONGO_PASSWORD" "$RELEASE_TAG" "stable"
\ No newline at end of file
diff --git a/bin/release-binary.sh b/bin/release-binary.sh
index 605c2df96..44e5ce3e3 100755
--- a/bin/release-binary.sh
+++ b/bin/release-binary.sh
@@ -1,23 +1,24 @@
 #!/usr/bin/env bash
 
-BRANCH="$1"
-SHORT_HASH="$2"
-MONGO_URL="$3"
-MONGO_USERNAME="$4"
-MONGO_PASSWORD="$5"
-VERSION="$BRANCH+$SHORT_HASH"
+MONGO_URL="$1"
+MONGO_USERNAME="$2"
+MONGO_PASSWORD="$3"
+PARAM_1="$4"
+PARAM_2="$5"
+
+echo "Mongo URL: $MONGO_URL"
 
 if [[ -z "$MONGO_USERNAME" || -z "$MONGO_PASSWORD" ]]; then
 	echo "No mongo credentials so doing nothing..."
 	return 1
 fi
 
-echo "Mongo URL: $MONGO_URL"
-
-if [[ "$BRANCH" == 'master' ]]; then
-	FIELD="betaCliVersion"
-else
+if [[ "$PARAM_2" == 'stable' ]]; then
 	FIELD="stableCliVersion"
+	VERSION="$PARAM_1"
+else
+	FIELD="betaCliVersion"
+	VERSION="master+$PARAM_1"
 fi
 
 echo "Release: $FIELD as $VERSION"