Merge pull request #34 from aliascash/develop_android

Fixed GitHub tag creation for builds from Android master branch
aliascash · Sep 6, 2021 · 9a6c527 · 9a6c527
2 parents ebdc09c + ad99ef9
commit 9a6c527
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -33,7 +33,7 @@ jobs:
               majorVersion=$(grep CLIENT_VERSION_MAJOR ${{ github.workspace }}/CMakeLists.txt     | head -n1 | cut -d ' ' -f2 | sed 's/)//g' | tr -d '\\n' | tr -d '\\r' | sed 's/ //g')
               minorVersion=$(grep CLIENT_VERSION_MINOR ${{ github.workspace }}/CMakeLists.txt     | head -n1 | cut -d ' ' -f2 | sed 's/)//g' | tr -d '\\n' | tr -d '\\r' | sed 's/ //g')
               bugfixVersion=$(grep CLIENT_VERSION_REVISION ${{ github.workspace }}/CMakeLists.txt | head -n1 | cut -d ' ' -f2 | sed 's/)//g' | tr -d '\\n' | tr -d '\\r' | sed 's/ //g')
-              codeVersion=$(grep ANDROID_VERSION_CODE ${{ github.workspace }}/CMakeLists.txt      | head -n1 | cut -d ' ' -f2 | sed 's/)//g' | tr -d '\\n' | tr -d '\\r' | sed 's/ //g')
+              codeVersion=$(grep ANDROID_VERSION_CODE ${{ github.workspace }}/CMakeLists.txt      | head -n2 | tail -n1 | cut -d ' ' -f2 | sed 's/)//g' | tr -d '\\n' | tr -d '\\r' | sed 's/ //g')
               echo "::set-output name=alias_release::$(printf '%s.%s.%s.%s-Android' $majorVersion $minorVersion $bugfixVersion $codeVersion)"
           else
               echo "::set-output name=alias_release::Build${{ github.run_number }}-Android"

diff --git a/Docker/Android/Dockerfile b/Docker/Android/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-android:1.1 as build
+FROM aliascash/alias-wallet-builder-android:1.2 as build
 MAINTAINER HLXEasy <[email protected]>
 
 # Build parameters

diff --git a/Docker/Android/Dockerfile_noUpload b/Docker/Android/Dockerfile_noUpload
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 ### At first perform source build ###
-FROM aliascash/alias-wallet-builder-android:1.1
+FROM aliascash/alias-wallet-builder-android:1.2
 MAINTAINER HLXEasy <[email protected]>
 
 # Build parameters