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.

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

Pinned x/sys to certain version that is buildable for windows platform #1626

Merged
merged 1 commit into from
Oct 10, 2019

Conversation

bwplotka
Copy link
Member

@bwplotka bwplotka requested review from brancz and metalmatze October 10, 2019 16:35
@bwplotka bwplotka changed the title Pineed x/sys to certain version that is buildable for windows platform Pinned x/sys to certain version that is buildable for windows platform Oct 10, 2019
@bwplotka bwplotka requested a review from povilasv October 10, 2019 16:36
Copy link
Contributor

@metalmatze metalmatze left a comment

Choose a reason for hiding this comment

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

lgtm

@bwplotka
Copy link
Member Author

Still crossbuild is not happy:

# windows-amd64
all modules verified
>> building binaries /go/bin
 >   thanos.exe
go: finding github.com/elastic/go-windows v1.0.0
# golang.org/x/crypto/ssh/terminal
/go/pkg/mod/golang.org/x/[email protected]/ssh/terminal/util_windows.go:97:61: multiple-value "golang.org/x/sys/windows".GetCurrentProcess() in single-value context
!! command failed: build -o .build/windows-amd64/thanos.exe -ldflags -X github.com/prometheus/common/version.Version=0.8.0 -X github.com/prometheus/common/version.Revision=8edfff2bc37bf77f96ed52020776007a189718ae -X github.com/prometheus/common/version.Branch=upgrade-deps -X github.com/prometheus/common/version.BuildUser=root@14fff3014701 -X github.com/prometheus/common/version.BuildDate=20191010-16:36:51  -extldflags '-static' -a -tags netgo github.com/thanos-io/thanos/cmd/thanos: exit status 2
make: *** [Makefile:117: build] Error 1
!! exit status 2
The base builder docker image exited unexpectedly
github.com/prometheus/promu/cmd.runCrossbuild
        /tmp/thanos-go/src/github.com/prometheus/promu/cmd/crossbuild.go:162
github.com/prometheus/promu/cmd.Execute
        /tmp/thanos-go/src/github.com/prometheus/promu/cmd/promu.go:130
main.main
        /tmp/thanos-go/src/github.com/prometheus/promu/main.go:20
runtime.main
        /home/bwplotka/.gvm/gos/go1.13.1/src/runtime/proc.go:203
runtime.goexit
        /home/bwplotka/.gvm/gos/go1.13.1/src/runtime/asm_amd64.s:1357

@bwplotka bwplotka merged commit 7b60b21 into master Oct 10, 2019
@bwplotka bwplotka deleted the upgrade-deps branch October 10, 2019 16:50
bwplotka added a commit that referenced this pull request Oct 14, 2019
bwplotka added a commit that referenced this pull request Oct 14, 2019
…ase 0.8.1 (#1640)

* Pinned `x/sys` to certain version that is buildable for windows platform. (#1626)

Signed-off-by: Bartek Plotka <[email protected]>

* Post release update. (#1628)

Signed-off-by: Bartek Plotka <[email protected]>

* Removed Querier duplicate labels checks & made sure store will be not blocked for older Queriers.

Changes:
* Cleaned up the code a bit.
* Ensured proper locks.
* thanos_store_nodes_grpc_connections is not per store type and external labels. thanos_store_node_info is marked as deprecated.
* Added (optional, but enabled by default) compatibility label to store GW Info method with flag to disable it. Store only adds it if there is any labelset to advertise.
* Disabled any strict deduplication in external labels detection; just warning!
* More tests; compatibility tests for query pre 0.8.0 and new store GW.
* Remove compatibility label if spotted.

Fixes #1632

Signed-off-by: Bartek Plotka <[email protected]>

* Changelog fixes (#1634)

Signed-off-by: Bartek Plotka <[email protected]>
GiedriusS pushed a commit that referenced this pull request Oct 28, 2019
…orm. (#1626)

Signed-off-by: Bartek Plotka <[email protected]>
Signed-off-by: Giedrius Statkevičius <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants