From f165f984220b2c6ec4d6f1953508fea5cc50268b Mon Sep 17 00:00:00 2001 From: Muzahid Date: Tue, 1 Mar 2022 20:32:02 +0530 Subject: [PATCH] update changes --- lib/worker_multibuild.py | 15 +++++++-------- multibuild.py | 7 ++++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index f7eb334..dd04fa0 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -1,5 +1,5 @@ from os import listdir, walk -from os.path import exists, isfile, join +from os.path import exists, isfile, join, islink import requests import re @@ -59,13 +59,12 @@ def list_jobs(directory=".buildbot"): list jobs found in a directory """ results = [] - for _ in next(walk(directory))[1]: - if exists(join(directory, _, "Dockerfile")) and ( - exists(join(directory, _, "build.sh")) - or exists(join(directory, _, "test.sh")) - ): - results.append(_) - + files = ["Dockerfile", "build.sh", "test.sh"] + for file in files: + print(join(directory, file)) + print(exists(join(directory, file))) + if exists(join(directory, file)) and not islink(join(directory, file)): + results.append(file) return results diff --git a/multibuild.py b/multibuild.py index 1b621d8..e66ca95 100644 --- a/multibuild.py +++ b/multibuild.py @@ -34,9 +34,14 @@ def add_parent_step(build_factory): Add a step to the parent build factory that will trigger the child hooks """ + build_factory.addStep(steps.ShellCommand( + name="create directory", + command=["mkdir", "-p", join(getenv['HOME'], '.local/bin') ] + )) + build_factory.addStep(steps.ShellCommand( name="download worker", - command=["mkdir", "-p", join(getenv['HOME'], '.local/bin'), "&&", "wget", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", join(getenv['HOME'], '.local/bin/worker_multibuild.py')] + command=["wget", "-O", "https://git.bitmessage.org/Bitmessage/buildbot_multibuild/raw/branch/master/lib/worker_multibuild.py", join(getenv['HOME'], '.local/bin/worker_multibuild.py')] )) build_factory.addStep(