From aae97f3724ae35356237c176cc3f1029e646bb12 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 28 Oct 2021 10:48:57 +0300
Subject: [PATCH] fix prod
---
BuildBotLib/buildBotShedulers.py | 1 -
BuildBotLib/make.py | 23 +++++++++++++++--------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/BuildBotLib/buildBotShedulers.py b/BuildBotLib/buildBotShedulers.py
index 0545fa5..ad2e1cf 100644
--- a/BuildBotLib/buildBotShedulers.py
+++ b/BuildBotLib/buildBotShedulers.py
@@ -47,7 +47,6 @@ class BuildBotShedulers(BuildBotModule):
buildersDeployCode = ['DocsGenerator']
buildersReleaseCode = ['prodDeployer']
-
buildersRepo = ['RepoGen']
self.masterConf['schedulers'] = self.shedulers
diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py
index ca82bd3..1076173 100644
--- a/BuildBotLib/make.py
+++ b/BuildBotLib/make.py
@@ -277,13 +277,6 @@ class Make(BaseModule):
"repoLocation": repoLocation}
)]
- res += [steps.Trigger(schedulerNames=['releaser'],
- doStepIf=lambda step: self.isProdDeploer(step),
- set_properties={'copyFolder': 'Distro',
- 'prodName': 'prod.deb'}
-
- )]
-
return res
def getFactory(self):
@@ -317,6 +310,19 @@ class Make(BaseModule):
)
)
+ if self.platform == BaseModule.P_Linux:
+
+ factory.addStep(
+ steps.Trigger(schedulerNames=['releaser'],
+ doStepIf=lambda step:
+ self.isProdDeploer(step),
+ set_properties={
+ 'copyFolder': 'Distro',
+ 'prodName': 'prod.deb'
+ }
+ )
+ )
+
factory.addStep(
self.generateStep("git clean -xdf",
self.platform,
@@ -324,8 +330,9 @@ class Make(BaseModule):
lambda step: True)
)
+ clearCmd = "git submodule foreach --recursive git clean -xdf"
factory.addStep(
- self.generateStep("git submodule foreach --recursive git clean -xdf",
+ self.generateStep(clearCmd,
self.platform,
'Clean submodules',
lambda step: True)