Add default GOOS in Makefile and move breaking change of CHANGELOG.md

Signed-off-by: Henry Wang <[email protected]>
jaegertracing · May 29, 2020 · 90b5c3f · 90b5c3f
1 parent 287f088
commit 90b5c3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,11 @@ Changes by Version
 ### Backend Changes
 
 #### Breaking Changes
-* Add arm64 support for binaries and docker images. Rename the released binary name format to <Name>-<OS>-<ARCH>, tarball name format to jaeger-<Version>-<OS>-<ARCH> ([#2176](https://github.com/jaegertracing/jaeger/pull/2176), [@MrXinWang](https://github.com/MrXinWang))
 
 #### New Features
 
 #### Bug fixes, Minor Improvements
+* Add arm64 support for binaries and make architecture configurable in docker images. ([#2176](https://github.com/jaegertracing/jaeger/pull/2176), [@MrXinWang](https://github.com/MrXinWang))
 
 ### UI Changes
 

diff --git a/Makefile b/Makefile
@@ -30,6 +30,7 @@ ifeq ($(UNAME), s390x)
 else
 	RACE=-race
 endif
+GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 GOBUILD=CGO_ENABLED=0 installsuffix=cgo go build -trimpath
 GOTEST=go test -v $(RACE)