diff options
| author | George Goldberg <george@gberg.me> | 2018-03-13 13:36:23 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-13 13:36:23 +0000 |
| commit | fadcdd271a68b38571b75d1d38ab023f940ac83a (patch) | |
| tree | 7f413edd35401b54b2f4eb4a687da1ac273bcd4b /build | |
| parent | b66e4bc932ed76c1cfd2b5f4ec0cfce70cd9fbb4 (diff) | |
| parent | f2d26801b9647715fb43af873354d8def753868b (diff) | |
| download | chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.gz chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.bz2 chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'build')
| -rw-r--r-- | build/Jenkinsfile | 2 | ||||
| -rw-r--r-- | build/release.mk | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/build/Jenkinsfile b/build/Jenkinsfile index ebef7ca3d..7eb2fda88 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -31,7 +31,7 @@ podTemplate(label: 'jenkins-slave', ), containerTemplate( name: 'mattermost-inbucket', - image: 'jhillyerd/inbucket:latest', + image: 'jhillyerd/inbucket:release-1.2.0', resourceRequestCpu: '250m', resourceLimitCpu: '250m', resourceRequestMemory: '256Mi', diff --git a/build/release.mk b/build/release.mk index 8bd4f9afd..568616ec3 100644 --- a/build/release.mk +++ b/build/release.mk @@ -3,15 +3,27 @@ dist: | check-style test package build-linux: @echo Build Linux amd64 - env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform +ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64") + env GOOS=linux GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./ +else + env GOOS=linux GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/linux_amd64/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./ +endif build-osx: @echo Build OSX amd64 - env GOOS=darwin GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform +ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64") + env GOOS=darwin GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./ +else + env GOOS=darwin GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/darwin_amd64/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./ +endif build-windows: @echo Build Windows amd64 - env GOOS=windows GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform +ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64") + env GOOS=windows GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/platform.exe $(GOFLAGS) $(GO_LINKER_FLAGS) ./ +else + env GOOS=windows GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/windows_amd64/platform.exe $(GOFLAGS) $(GO_LINKER_FLAGS) ./ +endif build: build-linux build-windows build-osx |