.gitlab-ci.yml

@@ -4,10 +4,13 @@ stages:
   - update
   - build-debug
   - build-release
+  - release
   - deploy
 
 update:
   stage: update
+  except:
+    - tags
   script:
     - flutter packages get
     - flutter packages upgrade
@@ -15,6 +18,8 @@ update:
 
 android:build-debug:
   stage: build-debug
+  except:
+    - tags
   script:
     # Flutter local configuration
     - echo flutter.sdk=$FLUTTER_PATH > android/local.properties
@@ -42,6 +47,8 @@ android:build-release:
   stage: build-release
   only:
     - master
+  except:
+    - tags
   dependencies:
     - android:build-debug
   script:
@@ -56,9 +63,19 @@ android:build-release:
     - 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
+    - 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}"
+    - >
+      if [ $(git tag -l "${TAG_NAME}") ]; then
+        echo "Tag ${TAG_NAME} already exists. Skipping build release."
+      else
+        flutter packages get
+        flutter clean
+        flutter build apk --release
+      fi
     # prepare artifact
     - find . -name "*.apk" # where is my apk?
   artifacts:
@@ -67,11 +84,41 @@ android:build-release:
     expire_in: 1 week
   interruptible: true
 
-android:deploy:
-  stage: deploy
+application:release:
+  stage: release
+  image:
+    name: alpine/git
+    entrypoint: [""]
   only:
     - master
+  except:
+    - tags
   dependencies:
     - android:build-release
   script:
-    - wget ${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN}
+    - apk --no-cache add curl
+    - git config user.email "${GITLAB_USER_EMAIL}"
+    - git config user.name "${GITLAB_USER_NAME}"
+    - git remote set-url 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}"
+    - >
+      if [ $(git tag -l "${TAG_NAME}") ]; then
+        echo "Tag ${TAG_NAME} already exists. Skipping release and tag creation."
+      else
+        git tag -a "${TAG_NAME}" -m "Release ${VERSION_NAME} (${VERSION_CODE})"
+        git push origin "${TAG_NAME}"
+        curl --silent -d "{\"token\": \"${JABBER_NOTIFICATION_TOKEN}\", \"message\": \"New tag for ${CI_PROJECT_PATH}: ${TAG_NAME}\"}" -H "Content-Type: application/json" -X POST ${JABBER_NOTIFICATION_URL}
+      fi
+
+android:deploy:
+  stage: deploy
+  only:
+    - tags
+  dependencies:
+    - application:release
+  script:
+    - curl "${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN}"

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.13
-app.versionCode=13
+app.versionName=0.0.24
+app.versionCode=24

assets/files/templates.json

@@ -38,6 +38,44 @@
         "0410200010000200"
       ]
     },
+    "3x2": {
+      "easy": [
+        "000142214003050361006500503006000405",
+        "420000000000241030356410602040014603",
+        "540010030050120405003162360521210643",
+        "014300023160005423342516406230230005",
+        "200061004530000206006015045120302050",
+        "651400230600460201020004500103000006",
+        "010602206051160305523004640013001000",
+        "500004042060010032024650460320003046",
+        "060123102500340050605341006005450610",
+        "560034004002000041105263600400050306"
+      ],
+      "medium": [
+        "005000600400300005200004020000010060",
+        "000060020051306040000005000000040020",
+        "023010100060500300030100000602005001",
+        "000306500002400000230000600030010640",
+        "000030006405030650002300000000160020",
+        "050100460000030020120603045000000305",
+        "063010410003000460645000030000100000",
+        "000000205004100000023010060001530040",
+        "620304000000500063400010003100040036",
+        "000120510600300000050301060010005000"
+      ],
+      "hard": [
+        "015000000400200000000014000000156300",
+        "003160000050006004300015040200231000",
+        "060000002000000002000300004010100650",
+        "002501500400605200000060000000020600",
+        "030100002600000420021000053000000030",
+        "103204205100006005000003500000600002",
+        "000200060300500002012004000003040100",
+        "052400000001000050005006040032020000",
+        "200160060023000600000002050430004000",
+        "400000060000010400006002000205050046"
+      ]
+    },
     "3x3": {
       "easy": [
         "004210007090083010000500200007050831910600740400000000006100000801007450050300000",