Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't use pkg for output, use out #1574

Merged
merged 1 commit into from
Aug 20, 2019
+25 −13
Merged

don't use pkg for output, use out #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ release: check-existing-release
xgo-install:
go get -u github.com/karalabe/xgo

gomobile-install:
go get -u golang.org/x/mobile/cmd/gomobile
gomobile-install: xtools-install
go get golang.org/x/mobile/cmd/gomobile

release-install:
go get -u github.com/c4milo/github-release
Expand All @@ -221,6 +221,10 @@ gen-install:
go get -u github.com/kevinburke/go-bindata/go-bindata@v3.13.0
go get -u github.com/golang/protobuf/protoc-gen-go@v1.3.1

xtools-install:
# special fix for gomobile issues
go get golang.org/x/tools/go/packages

modvendor-install:
# a tool to vendor non-go files
go get -u github.com/goware/modvendor
Expand Down
2 changes: 1 addition & 1 deletion _assets/ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pipeline {
GOPATH = "${env.WORKSPACE}"
PATH = "/usr/local/go/bin:${env.PATH}:${env.GOPATH}/bin"
/* This will override the var in Makefile */
RELEASE_DIR = "${env.WORKSPACE}/pkg"
RELEASE_DIR = "${env.WORKSPACE}/out"
}

stages {
Expand Down
10 changes: 7 additions & 3 deletions _assets/ci/Jenkinsfile.android
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ pipeline {
}

environment {
/* fix for gomobile complaining about missing packages */
CGO_ENABLED = "1"
GO111MODULE = "off"
/* Other stuff */
BUILD_PLATFORM = 'android'
STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go"
CI_DIR = "${env.STATUS_PATH}/_assets/ci"
Expand All @@ -47,7 +51,7 @@ pipeline {
println("Git Branch: ${lib.gitBranch()}")
println("Git Commit: ${lib.gitCommit()}")
/* save and create a dir for artifacts */
dest = "${env.WORKSPACE}/pkg"
dest = "${env.WORKSPACE}/out"
sh "mkdir -p ${dest}"
/* for easier reuse */
artifact = "status-go-android-${lib.suffix()}.aar"
Expand All @@ -63,11 +67,11 @@ pipeline {
} } }

stage('Archive') { steps {
archiveArtifacts("pkg/${artifact}")
archiveArtifacts("out/${artifact}")
} }

stage('Upload') { steps { script {
env.PKG_URL = lib.uploadArtifact("pkg/${artifact}")
env.PKG_URL = lib.uploadArtifact("out/${artifact}")
} } }
} // stages
post {
Expand Down
11 changes: 8 additions & 3 deletions _assets/ci/Jenkinsfile.ios
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ pipeline {
}

environment {
/* fix for gomobile complaining about missing packages */
CGO_ENABLED = "1"
GO111MODULE = "off"
/* Other stuff */
BUILD_PLATFORM = 'ios'
STATUS_PATH = "${env.WORKSPACE}/src/github.com/status-im/status-go"
CI_DIR = "${env.STATUS_PATH}/_assets/ci"
Expand All @@ -42,7 +46,7 @@ pipeline {
println("Git Branch: ${lib.gitBranch()}")
println("Git Commit: ${lib.gitCommit()}")
/* save and create a dir for artifacts */
dest = "${env.WORKSPACE}/pkg"
dest = "${env.WORKSPACE}/out"
sh "mkdir -p ${dest}"
/* for easier reuse */
artifact = "status-go-ios-${lib.suffix()}.zip"
Expand All @@ -54,18 +58,19 @@ pipeline {

stage('Compile') { steps { dir(env.STATUS_PATH) {
sh 'make statusgo-ios'
sh 'go get golang.org/x/tools/go/packages'
dir('build/bin') {
sh 'zip -r status-go-ios.zip Statusgo.framework'
sh "cp status-go-ios.zip ${dest}/${artifact}"
}
} } }

stage('Archive') { steps {
archiveArtifacts("pkg/${artifact}")
archiveArtifacts("out/${artifact}")
} }

stage('Upload') { steps { script {
env.PKG_URL = lib.uploadArtifact("pkg/${artifact}")
env.PKG_URL = lib.uploadArtifact("out/${artifact}")
} } }
} // stages
post {
Expand Down
6 changes: 3 additions & 3 deletions _assets/ci/Jenkinsfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pipeline {
println("Git Branch: ${lib.gitBranch()}")
println("Git Commit: ${lib.gitCommit()}")
/* save and create a dir for artifacts */
dest = "${env.WORKSPACE}/pkg"
dest = "${env.WORKSPACE}/out"
sh "mkdir -p ${dest}"
/* for easier reuse */
artifact = "status-go-desktop-${lib.suffix()}.zip"
Expand All @@ -57,11 +57,11 @@ pipeline {
} } }

stage('Archive') { steps {
archiveArtifacts("pkg/${artifact}")
archiveArtifacts("out/${artifact}")
} }

stage('Upload') { steps { script {
env.PKG_URL = lib.uploadArtifact("pkg/${artifact}")
env.PKG_URL = lib.uploadArtifact("out/${artifact}")
} } }
} // stages
post {
Expand Down
1 change: 0 additions & 1 deletion _assets/ci/Jenkinsfile.xgo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ pipeline {
failure { script { load("${CI_DIR}/ghcmgr.groovy").postBuild(false) } }
always { dir(env.STATUS_PATH) {
sh 'make clean'
sh "rm -fr ${dest}"
} }
} // post
}