Skip to content

Commit

Permalink
Update build environment to 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
johanbrandhorst committed Mar 4, 2020
1 parent 9bf8596 commit 8e3580c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.4
FROM golang:1.14.0

# Warm apt cache and install dependencies
# bzip2 is required by the node_tests (to extract its dependencies).
Expand All @@ -9,7 +9,7 @@ RUN apt-get update && \

# Install swagger-codegen
ENV SWAGGER_CODEGEN_VERSION=2.4.8
RUN wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${SWAGGER_CODEGEN_VERSION}/swagger-codegen-cli-${SWAGGER_CODEGEN_VERSION}.jar \
RUN wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${SWAGGER_CODEGEN_VERSION}/swagger-codegen-cli-${SWAGGER_CODEGEN_VERSION}.jar \
-O /usr/local/bin/swagger-codegen-cli.jar

# Wrap the jar for swagger-codgen
Expand Down
2 changes: 1 addition & 1 deletion .circleci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Contained within is the CI test setup for the Gateway. It runs on Circle CI.
Great, it should be as simple as thus (run from the root of the directory):

```bash
$ docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.13 \
$ docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.14 \
/bin/bash -c 'cd /go/src/github.com/grpc-ecosystem/grpc-gateway && \
make realclean && \
make examples'
Expand Down
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ version: 2
jobs:
build:
docker:
- image: jfbrandhorst/grpc-gateway-build-env:1.13
- image: jfbrandhorst/grpc-gateway-build-env:1.14
working_directory: /src/grpc-gateway
steps:
- checkout
- run: go build ./...
test:
docker:
- image: jfbrandhorst/grpc-gateway-build-env:1.13
- image: jfbrandhorst/grpc-gateway-build-env:1.14
working_directory: /src/grpc-gateway
environment:
GLOG_logtostderr: '1'
Expand All @@ -19,7 +19,7 @@ jobs:
- run: bash <(curl -s https://codecov.io/bash)
node_test:
docker:
- image: jfbrandhorst/grpc-gateway-build-env:1.13
- image: jfbrandhorst/grpc-gateway-build-env:1.14
working_directory: /src/grpc-gateway
steps:
- checkout
Expand All @@ -32,7 +32,7 @@ jobs:
./node_modules/.bin/gulp
generate:
docker:
- image: jfbrandhorst/grpc-gateway-build-env:1.13
- image: jfbrandhorst/grpc-gateway-build-env:1.14
working_directory: /src/grpc-gateway
steps:
- checkout
Expand All @@ -42,7 +42,7 @@ jobs:
- run: git diff --exit-code
lint:
docker:
- image: jfbrandhorst/grpc-gateway-build-env:1.13
- image: jfbrandhorst/grpc-gateway-build-env:1.14
working_directory: /src/grpc-gateway
steps:
- checkout
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
when: always
release:
docker:
- image: jfbrandhorst/grpc-gateway-build-env:1.13
- image: jfbrandhorst/grpc-gateway-build-env:1.14
working_directory: /src/grpc-gateway
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ All submissions, including submissions by project members, require review.
Great, it should be as simple as thus (run from the root of the directory):

```bash
docker run -v $(pwd):/src/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.13 \
docker run -v $(pwd):/src/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.14 \
/bin/bash -c 'cd /src/grpc-gateway && \
make realclean && \
make examples'
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grpc-ecosystem/grpc-gateway

go 1.13
go 1.14

require (
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
Expand Down

0 comments on commit 8e3580c

Please sign in to comment.