Merge pull request #1256 from digitalfabrik/1164-handle-versioning

1164: Handle versioning

.circleci/config.yml

@@ -440,6 +440,12 @@ jobs:
             - run:
                 command: echo "export NEW_VERSION_CODE=$(app-toolbelt v0 version calc | jq .versionCode)" >> ${BASH_ENV}
                 name: Calculate next version code
+            - when:
+                condition: << parameters.prepare_delivery >>
+                steps:
+                    - run:
+                        command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH}
+                        name: Bump git version
             - persist_environment_variables
     check:
         docker:
@@ -785,6 +791,8 @@ workflows:
     delivery_beta_native:
         jobs:
             - bump_version:
+                context:
+                    - deliverino
                 prepare_delivery: true
             - check_frontend
             - build_android:

.circleci/src/jobs/bump_version.yml

@@ -18,4 +18,21 @@ steps:
   - run:
       name: Calculate next version code
       command: echo "export NEW_VERSION_CODE=$(app-toolbelt v0 version calc | jq .versionCode)" >> ${BASH_ENV}
+  - when:
+      condition: << parameters.prepare_delivery >>
+      steps:
+        - run:
+            name: Bump git version
+            command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH}
+# TODO 1199
+#  - when:
+#      condition:
+#        and:
+#          - << parameters.prepare_delivery >>
+#          - not:
+#              equal: [main, << pipeline.git.branch >>]
+#      steps:
+#        - notify:
+#            success_message: Delivery was made on branch << pipeline.git.branch >>. Make sure to merge this branch before next delivery.
+#            only_for_branch: ${CIRCLE_BRANCH}
   - persist_environment_variables

.circleci/src/workflows/delivery_beta_native.yml

@@ -2,6 +2,8 @@ when: << pipeline.parameters.run_delivery_beta_native >>
 jobs:
   - bump_version:
       prepare_delivery: true
+      context:
+        - deliverino
   - check_frontend
   - build_android:
       name: build_android_bayern

administration/package.json

@@ -1,6 +1,5 @@
 {
   "name": "administration",
-  "version": "3.2.3",
   "private": true,
   "dependenciesComments": {
     "typescript": "Keeping on 5.0.x because of current incompatibility of 5.1.x with @typescript-eslint"

frontend/pubspec.yaml

@@ -5,18 +5,6 @@ description: App for the Bavarian Ehrenamtskarte owners.
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.2.3+128
-
 environment:
   sdk: 3.0.2
   flutter: 3.10.2

version.json

@@ -1 +1 @@
-{ "versionName": "2024.1.3", "versionCode": 130 }
+{"versionName":"2024.1.4","versionCode":131}