Skip to content

Commit 4a84d28

Browse files
[CI] Improvements (#613)
1 parent 89a3b4e commit 4a84d28

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/release-publish.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: "Publish new release"
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
84
workflow_dispatch:
95

106
jobs:

fastlane/Fastfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ end
9696

9797
lane :merge_release do |options|
9898
merge_release_to_main(author: options[:author])
99+
sh('gh workflow run release-publish.yml --ref main')
100+
end
101+
102+
lane :merge_main do
103+
merge_main_to_develop
99104
end
100105

101106
desc "Publish a new release to GitHub and CocoaPods"
@@ -122,7 +127,7 @@ lane :publish_release do |options|
122127

123128
update_spm(version: release_version)
124129

125-
merge_main_to_develop
130+
merge_main
126131
end
127132

128133
private_lane :appstore_api_key do

0 commit comments

Comments
 (0)