-
Notifications
You must be signed in to change notification settings - Fork 358
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dgraph-io:master' into master
- Loading branch information
Showing
4 changed files
with
32 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| go1.17.11 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,20 @@ | ||
| module github.com/dgraph-io/ristretto | ||
|
|
||
| go 1.12 | ||
| go 1.17 | ||
|
|
||
| require ( | ||
| github.com/cespare/xxhash/v2 v2.1.1 | ||
| github.com/cespare/xxhash/v2 v2.1.2 | ||
| github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 | ||
| github.com/dustin/go-humanize v1.0.0 | ||
| github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b | ||
| github.com/golang/glog v1.0.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/stretchr/testify v1.4.0 | ||
| go.uber.org/atomic v1.9.0 | ||
| golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f | ||
| golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| gopkg.in/yaml.v2 v2.2.2 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,22 @@ | ||
| #! /bin/sh | ||
| #!/bin/sh | ||
| DEFAULT_VERSION="1.17" | ||
| GOVERSION=$({ [ -f .go-version ] && cat .go-version; } || echo $DEFAULT_VERSION) | ||
|
|
||
| starttest() { | ||
| set -e | ||
| GO111MODULE=on go test -race ./... | ||
| set -e | ||
| GO111MODULE=on go test -race ./... | ||
| } | ||
|
|
||
| if [ -z "${TEAMCITY_VERSION}" ]; then | ||
| # running locally, so start test in a container | ||
| # TEAMCITY_VERSION=local will avoid recursive calls, when it would be running in container | ||
| docker run --rm --name ristretto-test -ti \ | ||
| -v `pwd`:/go/src/github.com/dgraph-io/ristretto \ | ||
| --workdir /go/src/github.com/dgraph-io/ristretto \ | ||
| --env TEAMCITY_VERSION=local \ | ||
| golang:1.16 \ | ||
| sh test.sh | ||
| # running locally, so start test in a container | ||
| # TEAMCITY_VERSION=local will avoid recursive calls, when it would be running in container | ||
| docker run --rm --name ristretto-test --tty --interactive \ | ||
| --volume `pwd`:/go/src/github.com/dgraph-io/ristretto \ | ||
| --workdir /go/src/github.com/dgraph-io/ristretto \ | ||
| --env TEAMCITY_VERSION=local \ | ||
| golang:$GOVERSION \ | ||
| sh test.sh | ||
| else | ||
| # running in teamcity, since teamcity itself run this in container, let's simply run this | ||
| starttest | ||
| # running in teamcity, since teamcity itself run this in container, let's simply run this | ||
| starttest | ||
| fi |