def IsTaggingRequested(step):
val = step.getProperty("tag")
- if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", val):
+ if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", val):
return True
else:
return False
def GetVersionPrefix(props):
basever = GetBaseVersion(props)
- if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", props["tag"]):
+ if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", props["tag"]):
return "%s/" % props["tag"]
elif basever != "master":
return "%s-SNAPSHOT/" % basever
description = "Tagging Git repository",
command = [home_dir+'/maketag.sh', '-i', '-k', str(gpg_keyid or ''),
'-p', str(gpg_passfile or ''), '-v', WithProperties("%(tag:-)s")],
- path = home_dir+'/source.git',
+ workdir = home_dir+'/source.git',
env = {'GNUPGHOME': gpg_home},
haltOnFailure = True,
doStepIf = IsTaggingRequested,
factory.addStep(ShellCommand(
name = "dltar",
description = "Building GNU tar",
- command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/install", "V=s"],
+ command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/compile", "V=s"],
env = MakeEnv(),
haltOnFailure = True
))