Skip to content

Commit 6806a84

Browse files
johanbrandhorstachew22
authored andcommitted
Switch to go modules
1 parent ada3454 commit 6806a84

File tree

9 files changed

+184
-354
lines changed

9 files changed

+184
-354
lines changed

.circleci/config.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,27 @@ jobs:
33
build:
44
docker:
55
- image: jfbrandhorst/grpc-gateway-build-env
6-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
6+
working_directory: /src/grpc-gateway
77
steps:
88
- checkout
9-
- run: dep ensure --vendor-only
109
- run: go build ./...
1110
test:
1211
docker:
1312
- image: jfbrandhorst/grpc-gateway-build-env
14-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
13+
working_directory: /src/grpc-gateway
1514
environment:
16-
GLOG_logtostderr: "1"
15+
GLOG_logtostderr: '1'
1716
steps:
1817
- checkout
19-
- run: dep ensure --vendor-only
2018
- run: go test -race -coverprofile=coverage.txt ./...
2119
- run: bash <(curl -s https://codecov.io/bash)
2220
node_test:
2321
docker:
2422
- image: jfbrandhorst/grpc-gateway-build-env
25-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
23+
working_directory: /src/grpc-gateway
2624
steps:
2725
- checkout
28-
- run: dep ensure --vendor-only
26+
- run: go mod vendor
2927
- run: >
3028
. $HOME/.nvm/nvm.sh &&
3129
cd examples/browser &&
@@ -35,25 +33,25 @@ jobs:
3533
generate:
3634
docker:
3735
- image: jfbrandhorst/grpc-gateway-build-env
38-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
36+
working_directory: /src/grpc-gateway
3937
steps:
4038
- checkout
4139
- run: make realclean
4240
- run: make examples SWAGGER_CODEGEN="${SWAGGER_CODEGEN}" # Set in Docker image
41+
- run: go mod tidy
4342
- run: git diff --exit-code
4443
lint:
4544
docker:
4645
- image: jfbrandhorst/grpc-gateway-build-env
47-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
46+
working_directory: /src/grpc-gateway
4847
steps:
4948
- checkout
50-
- run: dep ensure --vendor-only
5149
- run: go get golang.org/x/lint/golint
5250
- run: make lint
5351
bazel:
5452
docker:
5553
- image: l.gcr.io/google/bazel:latest
56-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
54+
working_directory: /src/grpc-gateway
5755
steps:
5856
- checkout
5957
- run:
@@ -67,22 +65,22 @@ jobs:
6765
- run:
6866
name: Check that Bazel BUILD files are up-to-date
6967
command: 'test -z "$(bazel run //:gazelle_diff)" ||
70-
(echo "ERROR: Bazel files out-of-date, please run \`bazel run :gazelle_fix\`" >&2; exit 1)'
68+
(echo "ERROR: Bazel files out-of-date, please run \`bazel run :gazelle_fix\`" >&2; exit 1)'
7169
- run:
7270
name: Run tests with Bazel
7371
command: bazel test //...
7472
- run:
7573
name: Check formatting of Bazel BUILD files
7674
command: 'bazel run //:buildifier_check ||
77-
(echo "ERROR: Bazel files not formatted, please run \`bazel run :buildifier\`" >&2; exit 1)'
75+
(echo "ERROR: Bazel files not formatted, please run \`bazel run :buildifier\`" >&2; exit 1)'
7876
when: always
7977
release:
8078
docker:
8179
- image: jfbrandhorst/grpc-gateway-build-env
82-
working_directory: /go/src/github.com/grpc-ecosystem/grpc-gateway
80+
working_directory: /src/grpc-gateway
8381
steps:
8482
- checkout
85-
- run: dep ensure --vendor-only
83+
- run: go mod vendor
8684
- run: curl -sL https://git.io/goreleaser | bash
8785
workflows:
8886
version: 2

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ bazel-testlogs
1010

1111
# Go vendor directory
1212
vendor
13+
14+
# Generated travis files
15+
.travis.yml

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ All submissions, including submissions by project members, require review.
2424
Great, it should be as simple as thus (run from the root of the directory):
2525

2626
```bash
27-
docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env \
28-
/bin/bash -c 'cd /go/src/github.com/grpc-ecosystem/grpc-gateway && \
27+
docker run -v $(pwd):/src/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env \
28+
/bin/bash -c 'cd /src/grpc-gateway && \
2929
make realclean && \
3030
make examples SWAGGER_CODEGEN="${SWAGGER_CODEGEN}"'
3131
docker run -itv $(pwd):/grpc-gateway -w /grpc-gateway --entrypoint /bin/bash --rm \

Gopkg.lock

Lines changed: 0 additions & 192 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)