Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Defines GOOS and GOARCH for windows builds #1621

Merged
merged 3 commits into from
Aug 11, 2016
Merged

Defines GOOS and GOARCH for windows builds #1621

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3115d75
defines GOOS and GOARCH for windows builds
Aug 10, 2016
d08cd51
default to amd64 on windows
Aug 10, 2016
307d3f5
windows: use latest versions of missing packages
Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ consistent with the behavior of `collection_jitter`.

### Bugfixes

- [#1619](https://github.com/influxdata/telegraf/issues/1619): Fix `make windows` build target
- [#1519](https://github.com/influxdata/telegraf/pull/1519): Fix error race conditions and partial failures.
- [#1477](https://github.com/influxdata/telegraf/issues/1477): nstat: fix inaccurate config panic.
- [#1481](https://github.com/influxdata/telegraf/issues/1481): jolokia: fix handling multiple multi-dimensional attributes.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build:
go install -ldflags "-X main.version=$(VERSION)" ./...

build-windows:
go build -o telegraf.exe -ldflags \
GOOS=windows GOARCH=386 go build -o telegraf.exe -ldflags \
Copy link
Contributor

@sparrc sparrc Aug 10, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer if we default to amd64 unless there is a significant reason not to

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I derived the value 386 from /scripts/build.py.

On Wed, Aug 10, 2016, 2:58 PM Cameron Sparr [email protected]
wrote:

In Makefile
#1621 (comment):

@@ -16,7 +16,7 @@ build:
go install -ldflags "-X main.version=$(VERSION)" ./...

build-windows:

  • go build -o telegraf.exe -ldflags \
  • GOOS=windows GOARCH=386 go build -o telegraf.exe -ldflags \

why 386? are windows servers still 32-bit?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
https://github.com/influxdata/telegraf/pull/1621/files/3115d751b00c6bdabc3795f5f71c9dac918093c3#r74339009,
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABGK3xw1rzcOgpCDOic7QjOHhikFvE_tks5qekmMgaJpZM4Jhf2Q
.

"-X main.version=$(VERSION)" \
./cmd/telegraf/telegraf.go

Expand Down