Skip to content

Commit da26991

Browse files
authored
ci: fastlane deployment fixes (#600)
1 parent df9f43b commit da26991

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/aws-amplify/amplify-ci-support
3-
revision: 6cf31df574fd6ff0d8aac28ada68bda615ccf84d
3+
revision: 26e84a769abecbdd6687829cc74d627ec1c6ba4c
44
branch: master
55
glob: src/fastlane/release_actions/*.gemspec
66
specs:
@@ -22,7 +22,7 @@ GEM
2222
json (>= 1.5.1)
2323
atomos (0.1.3)
2424
aws-eventstream (1.1.0)
25-
aws-partitions (1.336.0)
25+
aws-partitions (1.337.0)
2626
aws-sdk-core (3.102.1)
2727
aws-eventstream (~> 1, >= 1.0.2)
2828
aws-partitions (~> 1, >= 1.239.0)
@@ -177,7 +177,7 @@ GEM
177177
i18n (0.9.5)
178178
concurrent-ruby (~> 1.0)
179179
jmespath (1.4.0)
180-
json (2.3.0)
180+
json (2.3.1)
181181
jwt (2.1.0)
182182
memoist (0.16.2)
183183
mini_magick (4.10.1)

fastlane/Fastfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ platform :ios do
5050
version = options[:version].to_s
5151

5252
AmplifyPods.pods.each do |pod|
53-
spec, push, constants, plist_paths = pod.values
53+
spec, constants, plist_paths = pod.values
5454

5555
UI.message("Incrementing version for #{spec}")
5656

@@ -80,25 +80,28 @@ platform :ios do
8080
desc "Tag in git and push to GitHub"
8181
private_lane :add_tag do |options|
8282
next_version = options[:version]
83+
next_tag = "v#{next_version}"
8384

84-
add_git_tag(tag: next_version)
85-
push_git_tags(tag: next_version)
85+
add_git_tag(tag: next_tag)
86+
push_git_tags(tag: next_tag)
8687
end
8788

8889

8990
desc "Release pods"
9091
private_lane :release_pods do
9192
AmplifyPods.pods.each do |pod|
93+
pod_path = "/Users/distiller/amplify-ios/#{pod[:spec]}"
9294

9395
UI.message("Pushing pod #{pod[:spec]}")
94-
sh('pod', 'trunk', 'push', pod[:spec], '--allow-warnings', '--synchronous')
96+
97+
sh('pod', 'trunk', 'push', pod_path, '--allow-warnings', '--synchronous')
9598

9699
# TODO: utilize action once the PR for adding `synchronous` options has been merged
97100
# https://github.com/fastlane/fastlane/pull/16698
98101
# pod_push(path: pod[:spec], allow_warnings: true, synchronous: true)
99102

100-
# In theory `repo update` should no longer be needed with the synchronous option
101-
# Leaving it just in case. We can remove after the first successful release
102-
# sh('pod', 'repo', 'update')
103+
# This shouldn't be necessary... but it is
104+
sh('pod', 'repo', 'update')
105+
end
103106
end
104107
end

0 commit comments

Comments
 (0)