diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b99f15b0fc8add3bba7e3d38fbe737282027545..61b8c8f8970b40b8b2bfcd25ff5138c661d54499 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,8 @@ stages: update: stage: update + except: + - tags script: - flutter packages get - flutter packages upgrade @@ -16,6 +18,8 @@ update: android:build-debug: stage: build-debug + except: + - tags script: # Flutter local configuration - echo flutter.sdk=$FLUTTER_PATH > android/local.properties @@ -43,6 +47,8 @@ android:build-release: stage: build-release only: - master + except: + - tags dependencies: - android:build-debug script: @@ -76,7 +82,7 @@ application:release: only: - master except: - - tags + - tags dependencies: - android:build-release script: @@ -86,7 +92,7 @@ application:release: - VERSION_FILE="$(find . -name 'gradle.properties' | head -n1)" - VERSION_NAME="$(grep '^app.versionName=' "${VERSION_FILE}" | cut -d'=' -f2)" - VERSION_CODE="$(grep '^app.versionCode=' "${VERSION_FILE}" | cut -d'=' -f2)" - - TAG_NAME="Release_${VERSION_CODE}_${VERSION_NAME}" + - TAG_NAME="Release_${VERSION_NAME}_${VERSION_CODE}" - echo "${TAG_NAME}" - git tag -a "${TAG_NAME}" -m "Release ${VERSION_NAME} (${VERSION_CODE})" - git push origin "${TAG_NAME}" diff --git a/android/gradle.properties b/android/gradle.properties index 05f2f47d659639286844e03e2a00088c5fc37922..2b5c6c623f6d6ce853a968cd9661d80c2f6ef4bc 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=1.0.2 -app.versionCode=3 +app.versionName=1.0.3 +app.versionCode=4