fix updating bundler

digitalfabrik · Mar 5, 2024 · 270b69c · 270b69c
1 parent 9b94791
commit 270b69c
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 116 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -124,7 +124,7 @@ commands:
                 default: false
                 type: boolean
             channel:
-                default: entitlementcard-notifications
+                default: stefanie.metzger
                 type: string
             failure_mentions:
                 default: '@stefanie.metzger @andreas.fischer'
@@ -150,9 +150,11 @@ commands:
                 when: on_success
             - run:
                 command: |
+                    echo $MM_MESSAGE
                     echo 'export ALLOW_ALL_BRANCHES="<< parameters.allow-all-branches >>"' >> $BASH_ENV
                     app-toolbelt v0 notify mattermost --message "${MM_MESSAGE}" --channel << parameters.channel >> ${ALLOW_ALL_BRANCHES:+--allow-all-branches}
                     unset MM_MESSAGE
+                    echo $MM_MESSAGE
                 name: Mattermost Status Alert
                 when: always
     persist_environment_variables:
@@ -240,14 +242,14 @@ commands:
                 working_directory: ~/project/frontend/android
             - restore_cache:
                 keys:
-                    - 1-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
-                    - 1-gems-{{ arch }}-
+                    - 2-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
+                    - 2-gems-{{ arch }}-
             - run:
                 command: bundle check || bundle install
                 name: '[FL] install'
                 working_directory: << parameters.directory >>
             - save_cache:
-                key: 1-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
+                key: 2-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
                 paths:
                     - << parameters.directory >>/vendor/bundle
     setup_npm_global:
@@ -1194,60 +1196,6 @@ workflows:
                 production_delivery: false
                 requires:
                     - build_android_bayern
-            - build_android:
-                buildConfig: nuernberg
-                context:
-                    - credentials-repo
-                    - credentials-ehrenamtskarte
-                flutterFlavor: Nuernberg
-                name: build_android_nuernberg
-                requires:
-                    - bump_version
-                    - check_frontend
-            - deliver_android:
-                buildConfig: nuernberg
-                context:
-                    - tuerantuer-google-play
-                name: deliver_android_nuernberg
-                production_delivery: false
-                requires:
-                    - build_android_nuernberg
-            - build_ios:
-                buildConfig: bayern
-                context:
-                    - tuerantuer-apple
-                    - fastlane-match
-                flutterFlavor: Bayern
-                name: build_ios_bayern
-                requires:
-                    - bump_version
-                    - check_frontend
-            - deliver_ios:
-                buildConfig: bayern
-                context:
-                    - tuerantuer-apple
-                name: deliver_bayern_ios
-                production_delivery: false
-                requires:
-                    - build_ios_bayern
-            - build_ios:
-                buildConfig: nuernberg
-                context:
-                    - tuerantuer-apple
-                    - fastlane-match
-                flutterFlavor: Nuernberg
-                name: build_ios_nuernberg
-                requires:
-                    - bump_version
-                    - check_frontend
-            - deliver_ios:
-                buildConfig: nuernberg
-                context:
-                    - tuerantuer-apple
-                name: deliver_nuernberg_ios
-                production_delivery: false
-                requires:
-                    - build_ios_nuernberg
         when: << pipeline.parameters.run_delivery_beta_native >>
     delivery_production_native:
         jobs:

diff --git a/.circleci/src/commands/notify.yml b/.circleci/src/commands/notify.yml
@@ -13,7 +13,7 @@ parameters:
     default: false
     type: boolean
   channel:
-    default: entitlementcard-notifications
+    default: stefanie.metzger
     type: string
 steps:
   - run:
@@ -30,9 +30,11 @@ steps:
       when: on_success
   - run:
       command: |
+        echo $MM_MESSAGE
         echo 'export ALLOW_ALL_BRANCHES="<< parameters.allow-all-branches >>"' >> $BASH_ENV
         app-toolbelt v0 notify mattermost --message "${MM_MESSAGE}" --channel << parameters.channel >> ${ALLOW_ALL_BRANCHES:+--allow-all-branches}
         unset MM_MESSAGE
+        echo $MM_MESSAGE
       name: Mattermost Status Alert
       when: always
 
diff --git a/.circleci/src/commands/restore_ruby_cache.yml b/.circleci/src/commands/restore_ruby_cache.yml
@@ -10,13 +10,13 @@ steps:
       working_directory: ~/project/frontend/android
   - restore_cache:
       keys:
-        - 1-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
-        - 1-gems-{{ arch }}-
+        - 2-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
+        - 2-gems-{{ arch }}-
   - run:
       name: '[FL] install'
       command: bundle check || bundle install
       working_directory: << parameters.directory >>
   - save_cache:
-      key: 1-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
+      key: 2-gems-{{ arch }}-{{ checksum "<< parameters.directory >>/Gemfile.lock" }}
       paths:
         - << parameters.directory >>/vendor/bundle
diff --git a/.circleci/src/workflows/delivery_beta_native.yml b/.circleci/src/workflows/delivery_beta_native.yml
@@ -23,57 +23,57 @@ jobs:
       production_delivery: false
       requires:
         - build_android_bayern
-  - build_android:
-      name: build_android_nuernberg
-      buildConfig: "nuernberg"
-      flutterFlavor: "Nuernberg"
-      requires:
-        - bump_version
-        - check_frontend
-      context:
-        - credentials-repo
-        - credentials-ehrenamtskarte
-  - deliver_android:
-      name: deliver_android_nuernberg
-      buildConfig: "nuernberg"
-      context:
-        - tuerantuer-google-play
-      production_delivery: false
-      requires:
-        - build_android_nuernberg
-  - build_ios:
-      name: build_ios_bayern
-      buildConfig: "bayern"
-      flutterFlavor: "Bayern"
-      requires:
-        - bump_version
-        - check_frontend
-      context:
-        - tuerantuer-apple
-        - fastlane-match
-  - deliver_ios:
-      name: deliver_bayern_ios
-      buildConfig: bayern
-      context:
-        - tuerantuer-apple
-      production_delivery: false
-      requires:
-        - build_ios_bayern
-  - build_ios:
-      name: build_ios_nuernberg
-      buildConfig: "nuernberg"
-      flutterFlavor: "Nuernberg"
-      requires:
-        - bump_version
-        - check_frontend
-      context:
-        - tuerantuer-apple
-        - fastlane-match
-  - deliver_ios:
-      name: deliver_nuernberg_ios
-      buildConfig: nuernberg
-      context:
-        - tuerantuer-apple
-      production_delivery: false
-      requires:
-        - build_ios_nuernberg
+#  - build_android:
+#      name: build_android_nuernberg
+#      buildConfig: "nuernberg"
+#      flutterFlavor: "Nuernberg"
+#      requires:
+#        - bump_version
+#        - check_frontend
+#      context:
+#        - credentials-repo
+#        - credentials-ehrenamtskarte
+#  - deliver_android:
+#      name: deliver_android_nuernberg
+#      buildConfig: "nuernberg"
+#      context:
+#        - tuerantuer-google-play
+#      production_delivery: false
+#      requires:
+#        - build_android_nuernberg
+#  - build_ios:
+#      name: build_ios_bayern
+#      buildConfig: "bayern"
+#      flutterFlavor: "Bayern"
+#      requires:
+#        - bump_version
+#        - check_frontend
+#      context:
+#        - tuerantuer-apple
+#        - fastlane-match
+#  - deliver_ios:
+#      name: deliver_bayern_ios
+#      buildConfig: bayern
+#      context:
+#        - tuerantuer-apple
+#      production_delivery: false
+#      requires:
+#        - build_ios_bayern
+#  - build_ios:
+#      name: build_ios_nuernberg
+#      buildConfig: "nuernberg"
+#      flutterFlavor: "Nuernberg"
+#      requires:
+#        - bump_version
+#        - check_frontend
+#      context:
+#        - tuerantuer-apple
+#        - fastlane-match
+#  - deliver_ios:
+#      name: deliver_nuernberg_ios
+#      buildConfig: nuernberg
+#      context:
+#        - tuerantuer-apple
+#      production_delivery: false
+#      requires:
+#        - build_ios_nuernberg