status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix env variables pointing at android ndk for gomobile 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-02-25 10:04:53 +01:00 committed by Jakub
parent c654803a5f
commit 51ff6395b8
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -220,11 +220,7 @@ release:
gomobile-install: gomobile-install:
go get -u golang.org/x/mobile/cmd/gomobile go get -u golang.org/x/mobile/cmd/gomobile
ifdef NDK_GOMOBILE
gomobile init -ndk $(NDK_GOMOBILE)
else
gomobile init gomobile init
endif
release-install: release-install:
go get -u github.com/c4milo/github-release go get -u github.com/c4milo/github-release

7
_assets/ci/Jenkinsfile.android
View File

@ -2,6 +2,8 @@ pipeline {
agent { label 'linux' } agent { label 'linux' }
options { options {
timestamps()
disableConcurrentBuilds()
/* Go requires a certain directory structure */ /* Go requires a certain directory structure */
checkoutToSubdirectory('src/github.com/status-im/status-go') checkoutToSubdirectory('src/github.com/status-im/status-go')
/* manage how many builds we keep */ /* manage how many builds we keep */
@ -19,8 +21,9 @@ pipeline {
PATH = "${env.PATH}:${env.GOPATH}/bin" PATH = "${env.PATH}:${env.GOPATH}/bin"
ANDROID_HOME = '/usr/lib/android-sdk' ANDROID_HOME = '/usr/lib/android-sdk'
ANDROID_SDK_ROOT = '/usr/lib/android-sdk' ANDROID_SDK_ROOT = '/usr/lib/android-sdk'
ANDROID_NDK = '/usr/lib/android-ndk' /* gomobile requires a specific NDK version */
ANDROID_NDK_HOME = '/usr/lib/android-ndk' ANDROID_NDK = "${env.NDK_GOMOBILE}"
ANDROID_NDK_HOME = "${env.NDK_GOMOBILE}"
} }
stages { stages {

2
_assets/ci/Jenkinsfile.ios
View File

@ -2,6 +2,8 @@ pipeline {
agent { label 'macos' } agent { label 'macos' }
options { options {
timestamps()
disableConcurrentBuilds()
/* Go requires a certain directory structure */ /* Go requires a certain directory structure */
checkoutToSubdirectory('src/github.com/status-im/status-go') checkoutToSubdirectory('src/github.com/status-im/status-go')
/* manage how many builds we keep */ /* manage how many builds we keep */

2
_assets/ci/Jenkinsfile.linux
View File

@ -2,6 +2,8 @@ pipeline {
agent { label 'linux' } agent { label 'linux' }
options { options {
timestamps()
disableConcurrentBuilds()
/* Go requires a certain directory structure */ /* Go requires a certain directory structure */
checkoutToSubdirectory('src/github.com/status-im/status-go') checkoutToSubdirectory('src/github.com/status-im/status-go')
/* manage how many builds we keep */ /* manage how many builds we keep */