Skip to content

Commit

Permalink
Merge pull request #101 from SimonBaeumer/fix-windows-build
Browse files Browse the repository at this point in the history
Add exe suffix to windows binaries
  • Loading branch information
SimonBaeumer authored Oct 17, 2019
2 parents 4f3cb41 + a3998bc commit 1a31c3e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ stages:
- deploy

go:
- 1.12.x
- 1.13.x

sudo: required
dist: trusty

before_install:
- go get -u golang.org/x/lint/golint
- make deps
- curl -L https://github.com/SimonBaeumer/commander/releases/download/v0.3.0/commander-linux-amd64 -o ~/bin/commander
- curl -L https://github.com/SimonBaeumer/commander/releases/download/v1.2.1/commander-linux-amd64 -o ~/bin/commander
- chmod +x ~/bin/commander

jobs:
Expand Down Expand Up @@ -51,7 +50,7 @@ jobs:
before_install:
- choco install make
- choco install curl
- curl -L https://github.com/SimonBaeumer/commander/releases/download/v0.3.0/commander-windows-amd64 -o C:\Windows\system32\commander.exe
- curl -L https://github.com/SimonBaeumer/commander/releases/download/v1.2.1/commander-windows-amd64 -o C:\Windows\system32\commander.exe
script:
- make integration-windows

Expand Down Expand Up @@ -83,8 +82,8 @@ jobs:
- release/commander-linux-386
- release/commander-darwin-amd64
- release/commander-darwin-386
- release/commander-windows-amd64
- release/commander-windows-386
- release/commander-windows-amd64.exe
- release/commander-windows-386.exe
skip_cleanup: true
on:
repo: SimonBaeumer/commander
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.2.2

- Rename windows binary `commander-windows-386` to `commander-windows-386.exe`
- Rename windows binary `commander-windows-amd64` to `commander-windows-amd64.exe`
- Use commander v1.2.1 in travis build

# v1.2.1

- Fix `add` command if `stdout` or `stderr` properties were removed if a new test was added
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ release-darwin-386:

release-windows-amd64:
$(info INFO: Starting build $@)
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o release/$(cmd)-windows-amd64 $(exe)
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o release/$(cmd)-windows-amd64.exe $(exe)

release-windows-386:
$(info INFO: Starting build $@)
CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o release/$(cmd)-windows-386 $(exe)
CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o release/$(cmd)-windows-386.exe $(exe)


release: release-amd64 release-arm release-386 release-darwin-amd64 release-darwin-386 release-windows-amd64 release-windows-386

0 comments on commit 1a31c3e

Please sign in to comment.