Merge 8f8fbe6 into 22f3e1c

AnalogJ · web-flow · commit 84c57a9595b7 · 2019-09-12T15:41:19.000Z
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/capsule.yml b/capsule.yml
@@ -4,14 +4,15 @@ engine_enable_code_mutation: true
 engine_cmd_compile:
   - mkdir -p vendor/gopkg.in/libgit2/git2go.v25/vendor/libgit2/build/
   - cp /usr/local/linux/lib/pkgconfig/libgit2.pc vendor/gopkg.in/libgit2/git2go.v25/vendor/libgit2/build/libgit2.pc
-  - '. /scripts/toolchains/linux/linux-build-env.sh && go build -ldflags "-X main.goos=linux -X main.goarch=amd64" -o capsulecd-linux-amd64 -tags "static" cmd/capsulecd/capsulecd.go'
+  - '. /scripts/toolchains/linux/linux-build-env.sh && go build -ldflags "-X main.goos=linux -X main.goarch=amd64" -o capsulecd-linux-amd64 -tags "static" $(go list ./cmd/...)'
   - cp /usr/local/osx-ndk-x86/macports/pkgs/opt/local/lib/pkgconfig/libgit2.pc vendor/gopkg.in/libgit2/git2go.v25/vendor/libgit2/build/libgit2.pc
-  - '. /scripts/toolchains/osx/osx-build-env.sh &&  go build -ldflags "-X main.goos=darwin -X main.goarch=amd64" -o capsulecd-darwin-amd64 -tags "static" cmd/capsulecd/capsulecd.go'
+  - '. /scripts/toolchains/osx/osx-build-env.sh &&  go build -ldflags "-X main.goos=darwin -X main.goarch=amd64" -o capsulecd-darwin-amd64 -tags "static" $(go list ./cmd/...)'
   - 'echo "listing linked libraries" && ldd capsulecd-linux-amd64'
 engine_cmd_test: 'go test -v -tags "static" ./...'
 engine_cmd_lint: 'gometalinter.v2 --vendor --config=gometalinter.json ./...'
 engine_disable_lint: true
 
+mgr_keep_lock_file: true
 scm_enable_branch_cleanup: true
 
 scm_release_assets:
diff --git a/pkg/mgr/mgr_golang_dep_test.go b/pkg/mgr/mgr_golang_dep_test.go
@@ -60,6 +60,7 @@ func (suite *MgrGolangDepTestSuite) TestMgrGolangDepTestSuite_DependenciesStep()
 	require.NoError(suite.T(), err)
 	defer os.RemoveAll(parentPath)
 	suite.PipelineData.GitParentPath = parentPath
+	suite.PipelineData.GolangGoPath = parentPath
 	suite.PipelineData.GitLocalPath = path.Join(parentPath, "src", "dep_analogj_test")
 	os.MkdirAll(path.Join(parentPath, "src"),0666)
 	cerr := utils.CopyDir(path.Join("testdata", "golang", "dep_analogj_test"), suite.PipelineData.GitLocalPath)
diff --git a/pkg/pipeline/pipeline_data.go b/pkg/pipeline/pipeline_data.go
@@ -16,5 +16,4 @@ type Data struct {
 
 	//Engine specific pipeline data
 	GolangGoPath string
-	GolangGoRoot string
 }

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,4 @@ type Data struct {`
`16`	`16`
`17`	`17`	`//Engine specific pipeline data`
`18`	`18`	`GolangGoPath string`
`19`		`- GolangGoRoot string`
`20`	`19`	`}`