From 7e0beee8411778f1dadfa94671dea93bba69dff9 Mon Sep 17 00:00:00 2001
From: Doan Dinh <doan@nimblehq.co>
Date: Thu, 31 Aug 2023 16:50:54 +0700
Subject: [PATCH] [#169] Fix missing comments

---
 .../workflows/ios_deploy_to_app_store.yml     | 23 ++++++++---------
 .../workflows/ios_deploy_to_testflight.yml    | 25 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_app_store.yml b/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_app_store.yml
index 769127f7..37069ea3 100644
--- a/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_app_store.yml
+++ b/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_app_store.yml
@@ -38,15 +38,6 @@ jobs:
           channel: 'stable'
           flutter-version: '3.10.5'
 
-      - name: Generate new project
-        run: |
-          dart pub global activate mason_cli
-          mason get
-          mason make template -c mason-config.json
-          # Move the generated project to the root directory for next steps & cleanup to not affect static code analysis
-          rsync -av --remove-source-files flutter_templates/ ./
-          rm -rf bricks sample
-
       - name: Get Flutter dependencies
         run: flutter pub get
 
@@ -64,15 +55,15 @@ jobs:
         id: bunlderCache
         with:
           path: ios/vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
+          key: ${{#mustacheCase}} runner.os {{/mustacheCase}}-gems-${{#mustacheCase}} hashFiles('**/Gemfile.lock') {{/mustacheCase}}
+          restore-keys:  ${{#mustacheCase}} runner.os {{/mustacheCase}}-gems-
 
       - name: Cache Pods
         uses: actions/cache@v3
         id: cocoapodCache
         with:
           path: ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          key: ${{#mustacheCase}} runner.os {{/mustacheCase}}-pods-${{#mustacheCase}} hashFiles('**/Podfile.lock') {{/mustacheCase}}
           restore-keys: ${{ runner.os }}-pods-
 
       - name: Bundle install
@@ -81,8 +72,16 @@ jobs:
       - name: Pod install
         run: cd ./ios && pod install
 
+      - name: Update fastlane
+        run: cd ./ios && bundle update fastlane
+
+      - name: Update plugins
+        run: cd ./ios && bundle exec fastlane update_plugins
+
       - name: Match AppStore
         run: cd ./ios && bundle exec fastlane sync_appstore_production_signing
+        env:
+          GITHUB_RUN_NUMBER: $GITHUB_RUN_NUMBER
 
       - name: Deploy to AppStore
         run: |
diff --git a/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_testflight.yml b/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_testflight.yml
index 31330732..45edb3b9 100644
--- a/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_testflight.yml
+++ b/bricks/template/__brick__/{{project_name.snakeCase()}}/.github/workflows/ios_deploy_to_testflight.yml
@@ -38,15 +38,6 @@ jobs:
           channel: 'stable'
           flutter-version: '3.10.5'
 
-      - name: Generate new project
-        run: |
-        dart pub global activate mason_cli
-        mason get
-        mason make template -c mason-config.json
-        # Move the generated project to the root directory for next steps & cleanup to not affect static code analysis
-        rsync -av --remove-source-files flutter_templates/ ./
-        rm -rf bricks sample
-
       - name: Get Flutter dependencies
         run: flutter pub get
 
@@ -64,16 +55,16 @@ jobs:
         id: bunlderCache
         with:
           path: ios/vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
+          key: ${{#mustacheCase}} runner.os {{/mustacheCase}}-gems-${{#mustacheCase}} hashFiles('**/Gemfile.lock') {{/mustacheCase}}
+          restore-keys: ${{#mustacheCase}} runner.os {{/mustacheCase}}-gems-
 
       - name: Cache Pods
         uses: actions/cache@v3
         id: cocoapodCache
         with:
           path: ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-pods-
+          key: ${{#mustacheCase}} runner.os {{/mustacheCase}}-pods-${{#mustacheCase}} hashFiles('**/Podfile.lock') {{/mustacheCase}}
+          restore-keys: ${{#mustacheCase}} runner.os {{/mustacheCase}}-pods-
 
       - name: Bundle install
         run: cd ./ios && bundle install
@@ -81,8 +72,16 @@ jobs:
       - name: Pod install
         run: cd ./ios && pod install
 
+      - name: Update fastlane
+        run: cd ./ios && bundle update fastlane
+
+      - name: Update plugins
+        run: cd ./ios && bundle exec fastlane update_plugins
+
       - name: Match AppStore
         run: cd ./ios && bundle exec fastlane sync_appstore_production_signing
+        env:
+          GITHUB_RUN_NUMBER: $GITHUB_RUN_NUMBER
 
       - name: Deploy to TestFlight
         run: |