From 09640e64af81ae8cd61ef8788a6467afd0a8f2fc Mon Sep 17 00:00:00 2001
From: Petr Pokorny <petr-pokorny@hotmail.com>
Date: Mon, 1 Feb 2021 10:03:18 +0100
Subject: [PATCH] Adding one more build step to ensure correct source code
 revision is used for the release.

---
 .github/workflows/android-release.yml         |  5 ++++
 .../android/scripts/ensure-code-revision.sh   | 25 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100755 platform/android/scripts/ensure-code-revision.sh

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 5491cf6d6..b85731b98 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -31,6 +31,11 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Ensure source code revision
+        run: scripts/ensure-code-revision.sh        
+        working-directory: platform/android
+        shell: bash 
+
       - name: Cache node modules
         uses: actions/cache@v2
         env:
diff --git a/platform/android/scripts/ensure-code-revision.sh b/platform/android/scripts/ensure-code-revision.sh
new file mode 100755
index 000000000..2da0d55a4
--- /dev/null
+++ b/platform/android/scripts/ensure-code-revision.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+set -u
+
+function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
+function finish { >&2 echo -en "\033[0m"; }
+trap finish EXIT
+
+VERSION_TAG=${VERSION_TAG:-''}
+if [[ -z ${VERSION_TAG} ]]; then
+    step "Determining version number from most recent relevant git tag…"
+    VERSION_TAG=$( git describe --tags --match=android-v*.*.* --abbrev=0 )
+    echo "Found tag: ${VERSION_TAG}"
+fi
+
+if [[ $( echo ${VERSION_TAG} | grep --invert-match android-v ) ]]; then
+    echo "Error: ${VERSION_TAG} is not a valid android version tag"
+    echo "VERSION_TAG should be in format: android-vX.X.X-pre.X"
+    exit 1
+fi
+
+step "Checking out source code at ${VERSION_TAG}"
+git checkout ${VERSION_TAG}
\ No newline at end of file