Merge bc13eff into c7ba373

.travis.yml

@@ -26,6 +26,9 @@ matrix:
   - go: 1.9
     env:
     - HOTROD=true
+  - go: 1.9
+    env:
+    - WINDOWS=true
 
 services:
   - docker
@@ -54,9 +57,28 @@ script:
   - if [ "$DOCKER" == true ]; then bash ./scripts/travis/build-docker-images.sh ; else echo 'skipping docker images'; fi
   - if [ "$ES_INTEGRATION_TEST" == true ]; then bash ./scripts/travis/es-integration-test.sh ; else echo 'skipping elastic search integration test'; fi
   - if [ "$HOTROD" == true ]; then bash ./scripts/travis/hotrod-integration-test.sh ; else echo 'skipping hotrod example'; fi
+  - if [ "$WINDOWS" == true ]; then bash ./scripts/travis/build-windows.sh ; else echo 'skipping windows'; fi
 
 after_success:
   - if [ "$COVERAGE" == true ]; then travis_retry goveralls -coverprofile=cover.out -service=travis-ci || true ; else echo 'skipping coverage'; fi
 
 after_failure:
   - if [ "$CROSSDOCK" == true ]; then make crossdock-logs ; else echo 'skipping crossdock'; fi
+
+deploy:
+  provider: releases
+  api_key:
+    secure: YOUR_API_KEY_ENCRYPTED
+  file:
+    - "cmd/standalone/standalone-linux"
+    - "cmd/standalone/standalone-windows.exe"
+    - "cmd/agent/agent-linux"
+    - "cmd/agent/agent-windows.exe"
+    - "cmd/query/query-linux"
+    - "cmd/query/query-windows.exe"
+    - "cmd/collector/collector-linux"
+    - "cmd/collector/collector-windows.exe"
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: jaegertracing/jaeger

Makefile

@@ -147,18 +147,34 @@ build_ui:
 build-all-in-one-linux: build_ui
 	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/standalone/standalone-linux $(BUILD_INFO) ./cmd/standalone/main.go
 
+.PHONY: build-all-in-one-windows
+build-all-in-one-windows: build_ui
+	CGO_ENABLED=0 GOOS=windows installsuffix=cgo go build -o ./cmd/standalone/standalone-windows.exe $(BUILD_INFO) ./cmd/standalone/main.go
+
 .PHONY: build-agent-linux
 build-agent-linux:
 	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/agent/agent-linux $(BUILD_INFO) ./cmd/agent/main.go
 
+.PHONY: build-agent-windows
+build-agent-windows:
+	CGO_ENABLED=0 GOOS=windows installsuffix=cgo go build -o ./cmd/agent/agent-windows.exe $(BUILD_INFO) ./cmd/agent/main.go
+
 .PHONY: build-query-linux
 build-query-linux:
 	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/query/query-linux $(BUILD_INFO) ./cmd/query/main.go
 
+.PHONY: build-query-windows
+build-query-windows:
+	CGO_ENABLED=0 GOOS=windows installsuffix=cgo go build -o ./cmd/query/query-windows.exe $(BUILD_INFO) ./cmd/query/main.go
+
 .PHONY: build-collector-linux
 build-collector-linux:
 	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/collector/collector-linux $(BUILD_INFO) ./cmd/collector/main.go
 
+.PHONY: build-collector-windows
+build-collector-windows:
+	CGO_ENABLED=0 GOOS=windows installsuffix=cgo go build -o ./cmd/collector/collector-windows.exe $(BUILD_INFO) ./cmd/collector/main.go
+
 .PHONY: docker-no-ui
 docker-no-ui: build-agent-linux build-collector-linux build-query-linux build-crossdock-linux
 	mkdir -p jaeger-ui-build/build/
@@ -167,6 +183,9 @@ docker-no-ui: build-agent-linux build-collector-linux build-query-linux build-cr
 .PHONY: docker
 docker: build_ui docker-no-ui
 
+.PHONY: build-windows
+build-windows: build-agent-windows build-collector-windows build-query-windows build-all-in-one-windows
+
 .PHONY: docker-images-only
 docker-images-only:
 	cp -r jaeger-ui-build/build/ cmd/query/jaeger-ui-build

scripts/travis/build-windows.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+make build-windows