mirror of
https://github.com/servo/servo.git
synced 2025-08-04 05:00:08 +01:00
command → script
This reverts commit abb46381510c549e37f615031add0f01eacd0b8c.
This commit is contained in:
parent
860c827265
commit
02e2d48b35
2 changed files with 6 additions and 6 deletions
|
@ -53,7 +53,7 @@ def main():
|
||||||
|
|
||||||
decision.create_task_with_in_tree_dockerfile(
|
decision.create_task_with_in_tree_dockerfile(
|
||||||
task_name="Linux x86_64: tidy + dev build + unit tests",
|
task_name="Linux x86_64: tidy + dev build + unit tests",
|
||||||
command="""
|
script="""
|
||||||
#./mach test-tidy --no-progress --all
|
#./mach test-tidy --no-progress --all
|
||||||
./mach build --dev
|
./mach build --dev
|
||||||
#./mach test-unit
|
#./mach test-unit
|
||||||
|
|
|
@ -78,7 +78,7 @@ class DecisionTask:
|
||||||
|
|
||||||
return self.create_task(
|
return self.create_task(
|
||||||
task_name="docker image build task for image: " + self.image_name(dockerfile),
|
task_name="docker image build task for image: " + self.image_name(dockerfile),
|
||||||
command="""
|
script="""
|
||||||
echo "$DOCKERFILE" | docker build -t taskcluster-built -
|
echo "$DOCKERFILE" | docker build -t taskcluster-built -
|
||||||
docker save taskcluster-built | lz4 > /%s
|
docker save taskcluster-built | lz4 > /%s
|
||||||
""" % self.DOCKER_IMAGE_ARTIFACT_FILENAME,
|
""" % self.DOCKER_IMAGE_ARTIFACT_FILENAME,
|
||||||
|
@ -114,7 +114,7 @@ class DecisionTask:
|
||||||
else:
|
else:
|
||||||
return basename
|
return basename
|
||||||
|
|
||||||
def create_task(self, *, task_name, command, image, max_run_time_minutes,
|
def create_task(self, *, task_name, script, image, max_run_time_minutes,
|
||||||
artifacts=None, dependencies=None, env=None, cache=None, scopes=None,
|
artifacts=None, dependencies=None, env=None, cache=None, scopes=None,
|
||||||
routes=None, extra=None, features=None,
|
routes=None, extra=None, features=None,
|
||||||
with_repo=True):
|
with_repo=True):
|
||||||
|
@ -129,12 +129,12 @@ class DecisionTask:
|
||||||
for k in ["GIT_URL", "GIT_REF", "GIT_SHA"]:
|
for k in ["GIT_URL", "GIT_REF", "GIT_SHA"]:
|
||||||
env[k] = os.environ[k]
|
env[k] = os.environ[k]
|
||||||
|
|
||||||
command = """
|
script = """
|
||||||
git init repo
|
git init repo
|
||||||
cd repo
|
cd repo
|
||||||
git fetch --depth 1 "$GIT_URL" "$GIT_REF"
|
git fetch --depth 1 "$GIT_URL" "$GIT_REF"
|
||||||
git reset --hard "$GIT_SHA"
|
git reset --hard "$GIT_SHA"
|
||||||
""" + command
|
""" + script
|
||||||
|
|
||||||
# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/environment
|
# https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/environment
|
||||||
decision_task_id = os.environ["TASK_ID"]
|
decision_task_id = os.environ["TASK_ID"]
|
||||||
|
@ -167,7 +167,7 @@ class DecisionTask:
|
||||||
"-x",
|
"-x",
|
||||||
"-e",
|
"-e",
|
||||||
"-c",
|
"-c",
|
||||||
deindent(command)
|
deindent(script)
|
||||||
],
|
],
|
||||||
"env": env,
|
"env": env,
|
||||||
"artifacts": {
|
"artifacts": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue