fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update merge script to support commercial repository

Browse Source 
See gh-42333
This commit is contained in:
Phillip Webb 2024-09-17 12:55:22 -07:00
parent 58834133f1
commit 5324c646e1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git/hooks/forward-merge
View File

@ -112,12 +112,16 @@ message_file=ARGV[0]
forward_merges = find_forward_merges(message_file) forward_merges = find_forward_merges(message_file)
exit 0 unless forward_merges exit 0 unless forward_merges
$log.debug "Loading config from ~/.spring-boot/forward_merge.yml" $log.debug "Loading config from ~/.spring-boot/forward-merge.yml"
config = YAML.load_file(File.join(Dir.home, '.spring-boot', 'forward-merge.yml')) config = YAML.load_file(File.join(Dir.home, '.spring-boot', 'forward-merge.yml'))
username = config['github']['credentials']['username'] username = config['github']['credentials']['username']
password = config['github']['credentials']['password'] password = config['github']['credentials']['password']
dry_run = config['dry_run'] dry_run = config['dry_run']
repository = 'spring-projects/spring-boot'
gradleProperties = IO.read('gradle.properties')
springBuildType = gradleProperties.match(/^spring\.build-type\s?=\s?(.*)$/)
repository = (springBuildType && springBuildType[1] != 'oss') ? "spring-projects/spring-boot-#{springBuildType[1]}" : "spring-projects/spring-boot";
$log.debug "Targeting repository #{repository}"
forward_merges.each do |forward_merge| forward_merges.each do |forward_merge|
existing_issue = get_issue(username, password, repository, forward_merge.issue) existing_issue = get_issue(username, password, repository, forward_merge.issue)