From 3aa37d6d1d8342649a35ee821f539a062c49bf61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 2 Dec 2022 12:53:42 -0500
Subject: [PATCH] ci: use submodule
Change-Id: I3f8301ad37cbf9d24fefd2e5d44c8cd60b4cf236
---
extras/ci/client-qt-gnulinux/Jenkinsfile | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/extras/ci/client-qt-gnulinux/Jenkinsfile b/extras/ci/client-qt-gnulinux/Jenkinsfile
index 8c465d773..e0d2b5074 100644
--- a/extras/ci/client-qt-gnulinux/Jenkinsfile
+++ b/extras/ci/client-qt-gnulinux/Jenkinsfile
@@ -99,21 +99,15 @@ pipeline {
def exec_cmd = { cmd -> sh base_cmd+cmd+"'" }
def dockerTopDir = '/foo/jami-project'
- def daemonDir = dockerTopDir + '/daemon'
def clientDir = dockerTopDir + '/client-qt'
- def installDir = dockerTopDir + '/install'
ansiColor('css') {
exec_cmd("""
cd ${clientDir}
- mkdir build
+ ./build.py --init
+ ./build.py --install --qt /usr/lib/libqt-jami/
cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=${installDir}/client-qt \
- -DLIBJAMI_INCLUDE_DIR=${daemonDir}/src/jami \
- -DLIBJAMI_XML_INTERFACES_DIR=${daemonDir}/bin/dbus \
- -DCMAKE_PREFIX_PATH=/usr/lib/libqt-jami \
- -DENABLE_TESTS=True
+ cmake .. -DENABLE_TESTS=True
make -j${cpuCount}
- make install
""")
exec_cmd("""
cd ${clientDir}
--
GitLab