File tree Expand file tree Collapse file tree 2 files changed +12
-11
lines changed Expand file tree Collapse file tree 2 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -178,11 +178,13 @@ jobs:
178
178
179
179
update-hybrid-common-versions :
180
180
description : " Creates a PR updating purchases-hybrid-common to latest release"
181
- docker :
182
- - image : cimg/ruby:3.3.0-node
181
+ executor :
182
+ name : rn/macos
183
+ resource_class : macos.x86.medium.gen2
184
+ xcode_version : 14.3.1
183
185
steps :
184
186
- checkout
185
- - revenuecat/install-gem-unix -dependencies :
187
+ - revenuecat/install-gem-mac -dependencies :
186
188
cache-version : v1
187
189
- revenuecat/trust-github-key
188
190
- revenuecat/setup-git-credentials
Original file line number Diff line number Diff line change @@ -163,8 +163,11 @@ lane :update_hybrid_common do |options|
163
163
sh ( 'yarn install --no-immutable' )
164
164
commit_current_changes ( commit_message : 'Update yarn.lock' )
165
165
166
+ # Pushing now in case updating podfile fails and needs to retry
167
+ push_to_git_remote ( set_upstream : true )
168
+
166
169
# This will update both PurchasesHybridCommonUI and PurchasesHybridCommon
167
- update_sample_podfile_lock_with_retry ( 'PurchasesHybridCommonUI' )
170
+ update_sample_podfile_lock_with_retry ( pod_name : 'PurchasesHybridCommonUI' )
168
171
169
172
push_to_git_remote ( set_upstream : true )
170
173
end
@@ -248,12 +251,6 @@ def get_phc_version
248
251
end
249
252
end
250
253
251
- def parse_pod_version
252
- Dir . chdir ( get_root_folder ) do
253
- return sh ( "cat #{ sample_path } /ios/Podfile.lock | grep \' Purchases (=\' | awk \' {print($4)}\' | sed \" s/)//g\" " ) . strip
254
- end
255
- end
256
-
257
254
def get_root_folder
258
255
return File . expand_path ( '../../' , __FILE__ )
259
256
end
@@ -268,7 +265,9 @@ def check_no_git_tag_exists(version_number)
268
265
end
269
266
end
270
267
271
- def update_sample_podfile_lock_with_retry ( pod_name )
268
+ private_lane :update_sample_podfile_lock_with_retry do |options |
269
+ pod_name = options [ :pod_name ]
270
+
272
271
retry_attempts = 4 # Total of 4 retries, with the first attempt considered, equals 5 attempts over 20 minutes
273
272
Dir . chdir ( File . expand_path ( "#{ sample_path } /ios" , get_root_folder ) ) do
274
273
begin
You can’t perform that action at this time.
0 commit comments