(buildbot) hack to get proper version for Spring 84.0

Author: tvo

buildbot/master/master.cfg

@@ -109,6 +109,20 @@ from buildbot.steps.shell import Compile, Test, ShellCommand, WarningCountingShe
 
 # description / descritionDone style : doing X / done X
 
+class GitRenameLocalBranch1(ShellCommand):
+	name = 'gitRenameLocalBranch1'
+	description = [WithBranch('renaming local git branch to temp')]
+	descriptionDone = [WithBranch('renamed local git branch to temp')]
+	command = ['git', 'branch', '-M', 'temp']
+	haltOnFailure = True
+
+class GitRenameLocalBranch2(ShellCommand):
+	name = 'gitRenameLocalBranch2'
+	description = [WithBranch('renaming local git branch to %s')]
+	descriptionDone = [WithBranch('renamed local git branch to %s')]
+	command = ['git', 'branch', '-M', WithBranch()]
+	haltOnFailure = True
+
 class BuildConfig(Compile):
 	name = 'buildConfig'
 	warnOnWarnings  = True
@@ -247,6 +261,8 @@ class WindowsFullBuildFactory(BuildFactory):
 		BuildFactory.__init__(self)
 		self.useProgress = False
 		self.addStep( Git(repourl=master_repo) )
+		self.addStep( GitRenameLocalBranch1() )
+		self.addStep( GitRenameLocalBranch2() )
 		self.addStep( SyncSubmodules() )
 		self.addStep( InitSubmodules() )
 		self.addStep( CreateBuildDir(extra_opts=common_win_opts) )
@@ -259,6 +275,8 @@ class LinuxFullBuildFactory(BuildFactory):
 		BuildFactory.__init__(self)
 		self.useProgress = False
 		self.addStep( Git(repourl=master_repo) )
+		self.addStep( GitRenameLocalBranch1() )
+		self.addStep( GitRenameLocalBranch2() )
 		self.addStep( SyncSubmodules() )
 		self.addStep( InitSubmodules() )
 		self.addStep( CreateBuildDir() )
@@ -270,6 +288,8 @@ class MacOSXFullBuildFactory(BuildFactory):
 		BuildFactory.__init__(self)
 		self.useProgress = False
 		self.addStep( Git(repourl=master_repo) )
+		self.addStep( GitRenameLocalBranch1() )
+		self.addStep( GitRenameLocalBranch2() )
 		self.addStep( SyncSubmodules() )
 		self.addStep( InitSubmodules() )
 		self.addStep( CreateBuildDir() )
@@ -283,6 +303,8 @@ class MacOSXQuickBuildFactory(BuildFactory):
 		BuildFactory.__init__(self)
 		self.useProgress = False
 		self.addStep( Git(repourl=master_repo) )
+		self.addStep( GitRenameLocalBranch1() )
+		self.addStep( GitRenameLocalBranch2() )
 		self.addStep( SyncSubmodules() )
 		self.addStep( InitSubmodules() )
 		self.addStep( CreateBuildDir() )
@@ -311,6 +333,8 @@ class ValidationBuildFactory(BuildFactory):
 		BuildFactory.__init__(self)
 		self.useProgress = False
 		self.addStep( Git(repourl=master_repo) )
+		self.addStep( GitRenameLocalBranch1() )
+		self.addStep( GitRenameLocalBranch2() )
 		self.addStep( SyncSubmodules() )
 		self.addStep( InitSubmodules() )
 		self.addStep( CreateBuildDir() )