Skip to content

Commit 39aae09

Browse files
committed
[multi-user CI] move templates under scala/ subdir
to offer CI to the dotty team, we'll also have a lampepfl/ subdir with their jobs
1 parent b36de6e commit 39aae09

13 files changed

+4
-3
lines changed

recipes/_master-jenkins-jobs.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ class Blurbs
2424
def templDesc(user, repo, branch, path)
2525
blurbs = Blurbs.new
2626

27-
m = path.match(/templates\/default\/jobs\/(.*)\.xml\.erb$/)
27+
m = path.match(/templates\/default\/jobs\/#{user}\/(.*)\.xml\.erb$/)
2828
if m == nil
2929
[]
3030
else
3131
relativePath = m.captures.first
3232

33-
[ { :templatePath => "jobs/#{relativePath}.xml.erb",
33+
[ { :templatePath => "jobs/#{user}/#{relativePath}.xml.erb",
3434
:scriptName => "jobs/#{relativePath}",
3535
:jobName => blurbs.versionedJob(repo, branch, relativePath),
3636
:user => user,
37-
:repo => repo,
37+
:repo => repo, # the main repo (we may refer to other repos under the same user in these jobs)
3838
:branch => branch,
3939
}
4040
]
@@ -78,6 +78,7 @@ def expandJobTemplates(user, repo, branch)
7878
end
7979

8080
# TODO: make consistent with scabot.conf.erb by construction
81+
# (each github user for which we create jobs should have a corresponding top-level section in scabot.conf)
8182
# create scala-$branch-$jobName for every template under jobs/
8283
%w{ 2.11.x 2.12.x }.each do | branch |
8384
expandJobTemplates("scala", "scala", branch)

0 commit comments

Comments
 (0)