Skip to content

Commit 5324c64

Browse files
committed
Update merge script to support commercial repository
See spring-projectsgh-42333
1 parent 5883413 commit 5324c64

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

git/hooks/forward-merge

+6-2
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,16 @@ message_file=ARGV[0]
112112
forward_merges = find_forward_merges(message_file)
113113
exit 0 unless forward_merges
114114

115-
$log.debug "Loading config from ~/.spring-boot/forward_merge.yml"
115+
$log.debug "Loading config from ~/.spring-boot/forward-merge.yml"
116116
config = YAML.load_file(File.join(Dir.home, '.spring-boot', 'forward-merge.yml'))
117117
username = config['github']['credentials']['username']
118118
password = config['github']['credentials']['password']
119119
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}"
121125

122126
forward_merges.each do |forward_merge|
123127
existing_issue = get_issue(username, password, repository, forward_merge.issue)

0 commit comments

Comments
 (0)