From 537482279bb430cca3ce7211989ff2f6e57d605d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Fri, 25 Jun 2021 10:04:51 +0200
Subject: [PATCH] Fix double build on create tag
---
.gitlab-ci.yml | 10 ++++++++--
android/gradle.properties | 4 ++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b99f15..61b8c8f 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 05f2f47..2b5c6c6 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
--
GitLab