status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-02 20:05:09 +00:00
Code Issues Projects Releases Wiki Activity

fix PATH for the compile step so we can use qmak

Browse Source 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2018-12-06 20:51:41 +01:00
parent 922caf168b
commit 65826b178f
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/Jenkinsfile.macos
View File

@ -51,14 +51,14 @@ pipeline {
} } } }
} }
stage('Compile') { stage('Compile') {
steps { nvm(env.NODE_VERSION) { steps {
script { desktop.compile() } script { desktop.compile() }
} } }
} }
stage('Bundle') { stage('Bundle') {
steps { steps { nvm(env.NODE_VERSION) {
script { dmg = desktop.bundleMacOS(cmn.getBuildType()) } script { dmg = desktop.bundleMacOS(cmn.getBuildType()) }
} } }
} }
stage('Archive') { stage('Archive') {
steps { archiveArtifacts dmg } steps { archiveArtifacts dmg }

4
ci/desktop.groovy
View File

@ -57,6 +57,10 @@ def prepDeps() {
} }
def compile() { 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' sh './scripts/build-desktop.sh compile'
} }

1
modules/react-native-status/desktop/CMakeLists.txt
View File

@ -40,6 +40,7 @@ ExternalProject_Add(StatusGo_ep
SOURCE_DIR ${StatusGo_SOURCE_DIR} SOURCE_DIR ${StatusGo_SOURCE_DIR}
GIT_REPOSITORY https://github.com/status-im/status-go.git GIT_REPOSITORY https://github.com/status-im/status-go.git
GIT_TAG ${STATUS_GO_TAG} GIT_TAG ${STATUS_GO_TAG}
GIT_SHALLOW true
URL https://status-go.ams3.digitaloceanspaces.com/status-go-desktop-${STATUS_GO_VERSION}.zip 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 https://github.com/status-im/status-go/archive/${STATUS_GO_VERSION}.zip
BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB} BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB}