From 65826b178f1cd07d5b2c07e64b60abe84e7bdb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 6 Dec 2018 20:51:41 +0100 Subject: [PATCH] fix PATH for the compile step so we can use qmak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.macos | 8 ++++---- ci/desktop.groovy | 4 ++++ modules/react-native-status/desktop/CMakeLists.txt | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index 4424682245..a4c92f01d3 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -51,14 +51,14 @@ pipeline { } } } stage('Compile') { - steps { nvm(env.NODE_VERSION) { + steps { script { desktop.compile() } - } } + } } stage('Bundle') { - steps { + steps { nvm(env.NODE_VERSION) { script { dmg = desktop.bundleMacOS(cmn.getBuildType()) } - } + } } } stage('Archive') { steps { archiveArtifacts dmg } diff --git a/ci/desktop.groovy b/ci/desktop.groovy index 713586f7bc..6685de68c1 100644 --- a/ci/desktop.groovy +++ b/ci/desktop.groovy @@ -57,6 +57,10 @@ def prepDeps() { } def compile() { + /* since QT is in a custom path we need to add it to PATH */ + if (env.QT_PATH) { + env.PATH = "${env.QT_PATH}:${env.PATH}" + } sh './scripts/build-desktop.sh compile' } diff --git a/modules/react-native-status/desktop/CMakeLists.txt b/modules/react-native-status/desktop/CMakeLists.txt index b2e9655168..96db4d74cf 100755 --- a/modules/react-native-status/desktop/CMakeLists.txt +++ b/modules/react-native-status/desktop/CMakeLists.txt @@ -40,6 +40,7 @@ ExternalProject_Add(StatusGo_ep SOURCE_DIR ${StatusGo_SOURCE_DIR} GIT_REPOSITORY https://github.com/status-im/status-go.git GIT_TAG ${STATUS_GO_TAG} + GIT_SHALLOW true URL https://status-go.ams3.digitaloceanspaces.com/status-go-desktop-${STATUS_GO_VERSION}.zip https://github.com/status-im/status-go/archive/${STATUS_GO_VERSION}.zip BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB}