diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77543d5f4ba3852fa0a4fc15701e1f4864133a8d..dbcffe67aa355c270321bd1b2f336ead8d3771f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,12 @@ image: cirrusci/flutter:latest stages: - - test - update - build-debug - build-release + - release - deploy -tests: - stage: test - script: - - flutter test - interruptible: true - update: stage: update script: @@ -47,25 +41,25 @@ android:build-debug: android:build-release: stage: build-release - only: - - master + # only: + # - master dependencies: - android:build-debug script: # Flutter local configuration - - echo flutter.sdk=$FLUTTER_PATH > android/local.properties - - echo sdk.dir=$ANDROID_SDK_PATH >> android/local.properties - - echo flutter.buildMode=release >> android/local.properties + # - echo flutter.sdk=$FLUTTER_PATH > android/local.properties + # - echo sdk.dir=$ANDROID_SDK_PATH >> android/local.properties + # - echo flutter.buildMode=release >> android/local.properties # Android signing - - echo "$ANDROID_KEYSTORE_FILE" | base64 -d > android/app/my.keystore - - echo storeFile=my.keystore > android/key.properties - - echo storePassword=$ANDROID_KEYSTORE_PASSWORD >> android/key.properties - - echo keyAlias=$ANDROID_KEY_ALIAS >> android/key.properties - - echo keyPassword=$ANDROID_KEY_PASSWORD >> android/key.properties + # - echo "$ANDROID_KEYSTORE_FILE" | base64 -d > android/app/my.keystore + # - echo storeFile=my.keystore > android/key.properties + # - echo storePassword=$ANDROID_KEYSTORE_PASSWORD >> android/key.properties + # - echo keyAlias=$ANDROID_KEY_ALIAS >> android/key.properties + # - echo keyPassword=$ANDROID_KEY_PASSWORD >> android/key.properties # build flutter app - - flutter packages get - - flutter clean - - flutter build apk --release + # - flutter packages get + # - flutter clean + # - flutter build apk --release # prepare artifact - find . -name "*.apk" # where is my apk? artifacts: @@ -74,11 +68,31 @@ android:build-release: expire_in: 1 week interruptible: true -android:deploy: - stage: deploy +application:release: + stage: release + image: + name: alpine/git only: - master dependencies: - android:build-release + script: + - git config user.email "${GITLAB_USER_EMAIL}" + - git config user.name "${GITLAB_USER_NAME}" + - git remote add release-tag-origin https://oauth2:${GITLAB_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH} + - 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_NAME}_${VERSION_CODE}" + - echo "${TAG_NAME}" + # - git tag -a "Release_$(date +%Y-%m-%d)" -m "Auto-Release ${}" + # - git push release-tag-origin "Release_$(date +%Y-%m-%d)" + +android:deploy: + stage: deploy + only: + - tags + dependencies: + - application:release script: - wget ${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN} diff --git a/android/gradle.properties b/android/gradle.properties index 379a5b70bc7d025bf005014c5ab18b682895abc4..05f2f47d659639286844e03e2a00088c5fc37922 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.1 -app.versionCode=2 +app.versionName=1.0.2 +app.versionCode=3