Merge pull request #2307 from CruGlobal/develop

Merge develop into master
CruGlobal · Sep 26, 2023 · baf3674 · baf3674
2 parents fb82520 + 3ce6e3c
commit baf3674
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -268,9 +268,6 @@ jobs:
         run: echo -e "machine github.com\n login $CI_USER_TOKEN" >> ~/.netrc
         env:
           CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN}}
-      - name: Bundle Install
-        working-directory: ios
-        run: bundle install
       - name: Import App Store Connect API Key
         env:
           APP_STORE_CONNECT_API_JSON_PAYLOAD: ${{ secrets.APP_STORE_CONNECT_API_JSON_PAYLOAD }}
@@ -288,6 +285,12 @@ jobs:
         env:
           MATCH_GIT_BASIC_AUTHORIZATION_PAT: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION_PAT }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      - name: Archive Fastlane Gym Logs
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastlane-gym-logs
+          path: "/Users/runner/Library/Logs/gym/MissionHub-MissionHub.log"
 
   android-deploy:
     runs-on: ubuntu-latest

diff --git a/android/Gemfile.lock b/android/Gemfile.lock
@@ -8,8 +8,8 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.824.0)
-    aws-sdk-core (3.181.1)
+    aws-partitions (1.825.0)
+    aws-sdk-core (3.182.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.215.1)
+    fastlane (2.216.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)

diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
@@ -16,8 +16,8 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.823.0)
-    aws-sdk-core (3.181.1)
+    aws-partitions (1.825.0)
+    aws-sdk-core (3.182.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)