File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -112,12 +112,16 @@ message_file=ARGV[0]
112
112
forward_merges = find_forward_merges ( message_file )
113
113
exit 0 unless forward_merges
114
114
115
- $log. debug "Loading config from ~/.spring-boot/forward_merge .yml"
115
+ $log. debug "Loading config from ~/.spring-boot/forward-merge .yml"
116
116
config = YAML . load_file ( File . join ( Dir . home , '.spring-boot' , 'forward-merge.yml' ) )
117
117
username = config [ 'github' ] [ 'credentials' ] [ 'username' ]
118
118
password = config [ 'github' ] [ 'credentials' ] [ 'password' ]
119
119
dry_run = config [ 'dry_run' ]
120
- repository = 'spring-projects/spring-boot'
120
+
121
+ gradleProperties = IO . read ( 'gradle.properties' )
122
+ springBuildType = gradleProperties . match ( /^spring\. build-type\s ?=\s ?(.*)$/ )
123
+ repository = ( springBuildType && springBuildType [ 1 ] != 'oss' ) ? "spring-projects/spring-boot-#{ springBuildType [ 1 ] } " : "spring-projects/spring-boot" ;
124
+ $log. debug "Targeting repository #{ repository } "
121
125
122
126
forward_merges . each do |forward_merge |
123
127
existing_issue = get_issue ( username , password , repository , forward_merge . issue )
You can’t perform that action at this time.
0 commit comments