summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2018-11-14 10:59:25 +0100
committerOliver Smith <osmith@sysmocom.de>2018-11-16 15:10:06 +0100
commit82c6c9ba143e192debd52bc605d46de3e58c22a0 (patch)
tree790d7e46b863364edd6893be9b3aa493dfc79d21
parente4f281129641d9c5e38b256541c1b8b47e71a190 (diff)
jenkins.sh: do not use libosomcore source
Build scripts do not depend on the libosmocore sources anymore with 161365f ("merge_doc.xsl: move from libosmocore.git"), so don't try to use them in jenkins.sh anymore. Related: OS#3385 Change-Id: Ied3661b8a02e9defca0e5aedcc4494845553db84
-rwxr-xr-xcontrib/jenkins.sh14
1 files changed, 2 insertions, 12 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 573e042..80d873d 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -4,20 +4,10 @@ set -ex
publish="$1"
-base="$PWD"
-deps="$base/deps"
-export deps
-
osmo-clean-workspace.sh
-mkdir "$deps" || true
-
-cd "$deps"
-osmo-deps.sh libosmocore
-
-cd "$base"
-$MAKE $PARALLEL_MAKE LIBOSMO_DIR="$deps/libosmocore"
-$MAKE $PARALLEL_MAKE LIBOSMO_DIR="$deps/libosmocore" check
+$MAKE $PARALLEL_MAKE
+$MAKE $PARALLEL_MAKE check
if [ "x$publish" = "x--publish" ]; then
mkdir out/