aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-03-20 19:25:44 +0100
committerHarald Welte <laforge@gnumonks.org>2018-04-14 11:40:04 +0000
commit28eff46deb4d128d2edfbca1318c2c1953a64d8d (patch)
treef80263de94d8789865a459171e259d10e2adbc48
parenta2f86fb5bebf4d1798cd143b8939b624cfdddcef (diff)
jobs: gerrit-osmo-ttcn3-hacks: Make deps before cleaning
make clean has subdir/Makefile as dependency. As a result, subdir/gen_links.sh and subdir/makefile-regen.sh are called, and ttcn3_makefilegen in there fails because the dep symlinks are done against missing files (because git repos in deps have not been checked out). Additionally, since 61c11e9234b3f9e087aba94380892ab66abc1191 make deps-update is equivalent to make deps since the dependency tracking system was improved, so we can remove it as it's not needed anymore. Change-Id: I07fee78bba5b07c7f3f4359869e00ef2583e0769
-rw-r--r--jobs/gerrit-verifications.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 640bde7..7613802 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -189,7 +189,8 @@
slave_axis: !!python/tuple [ttcn3]
cmd: >
# keep first line with less indent to preserve newlines
- make clean; make deps-update && make compile
+ set -e
+ make deps; make clean; make compile
jobs:
- 'gerrit-{repos}'