Use S3 for fastlane match (#23186)

wordpress-mobile · May 13, 2024 · 01a1899 · 01a1899
2 parents 6098621 + a701f3e
commit 01a1899
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/.configure b/.configure
@@ -1,13 +1,8 @@
 {
   "project_name": "WordPress-iOS",
   "branch": "trunk",
-  "pinned_hash": "91e71c2268b4df54591ff9cedbfd03ac93ba865d",
+  "pinned_hash": "96b8f38f614556658c0cf5eb86a61027d48fd1de",
   "files_to_copy": [
-    {
-      "file": "shared/google_cloud_keys.json",
-      "destination": "~/.configure/wordpress-ios/secrets/google_cloud_keys.json",
-      "encrypt": true
-    },
     {
       "file": "iOS/WPiOS/project.env",
       "destination": "~/.configure/wordpress-ios/secrets/project.env",

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,17 +24,17 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.897.0)
-    aws-sdk-core (3.191.3)
+    aws-partitions (1.926.0)
+    aws-sdk-core (3.194.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.144.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.149.1)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -162,15 +162,15 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.3.0)
-    fastlane (2.219.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -191,10 +191,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (>= 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -203,7 +203,7 @@ GEM
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.20.0)
       os (~> 1.1, >= 1.1.4)
@@ -289,7 +289,7 @@ GEM
     minitest (5.22.3)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -305,7 +305,7 @@ GEM
       sawyer (~> 0.9)
     open4 (1.3.4)
     options (2.3.2)
-    optparse (0.4.0)
+    optparse (0.5.0)
     os (1.1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -318,7 +318,7 @@ GEM
     public_suffix (4.0.7)
     racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rake-compiler (1.2.7)
       rake
     rb_sys (0.9.90)
@@ -354,7 +354,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    security (0.1.3)
+    security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)

diff --git a/fastlane/lanes/codesign.rb b/fastlane/lanes/codesign.rb
@@ -194,9 +194,8 @@ def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_pa
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
   match(
-    storage_mode: 'google_cloud',
-    google_cloud_bucket_name: 'a8c-fastlane-match',
-    google_cloud_keys_file: File.join(SECRETS_DIR, 'google_cloud_keys.json'),
+    storage_mode: 's3',
+    s3_bucket: 'a8c-fastlane-match',
     type: type,
     team_id: team_id,
     readonly: readonly,