Skip to content

Commit ef7a035

Browse files
author
EvaBardou
committed
Fix CI
1 parent 969bbf0 commit ef7a035

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.taskcluster.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,12 @@ tasks:
295295
GIT_REPOSITORY: ${repository}
296296
GIT_REVISION: ${head_rev}
297297
command:
298-
- bash
299-
- backend/build.sh
300-
- "${head_rev}"
301-
- "${head_branch}"
302-
- "${repository}"
303-
- "${taskcluster_root_url}/tasks/{$eval: as_slugid('backend_build')}"
304-
- "${channel}"
298+
- /bin/sh
299+
- -lxce
300+
- "apt-get update -q && apt-get install -q -y --no-install-recommends git &&
301+
git clone --quiet ${repository} /src && cd /src && git checkout ${head_rev} -b build &&
302+
/bin/sh backend/build.sh ${head_rev} ${head_branch} ${repository}
303+
${taskcluster_root_url}/tasks/{$eval: as_slugid('backend_build')} ${channel}"
305304
artifacts:
306305
public/code-review-backend.tar:
307306
expires: {$fromNow: '2 weeks'}

backend/build.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
#!/bin/bash
2-
1+
#!/bin/sh
32
COMMIT_SHA=$1
43
VERSION=$2
54
SOURCE=$3
65
BUILD_URL=$4
76
CHANNEL=$5
87

9-
# create a version.json per https://github.com/mozilla-services/Dockerflow/blob/master/docs/version_object.md
8+
# Create a version.json per https://github.com/mozilla-services/Dockerflow/blob/master/docs/version_object.md
109
printf '{"commit": "%s", "version": "%s", "source": "%s", "build": "%s"}\n' \
1110
"$COMMIT_SHA" \
1211
"$VERSION" \
1312
"$SOURCE" \
1413
"$BUILD_URL" > backend/code_review_backend/version.json
1514

16-
taskboot build --image mozilla/code-review --tag "$CHANNEL" --tag "$COMMIT_SHA" --write /backend.tar backend/Dockerfile
15+
taskboot --target /src build --image mozilla/code-review --tag "$CHANNEL" --tag "$COMMIT_SHA" --write /backend.tar backend/Dockerfile

0 commit comments

Comments
 (0)