Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Commit

Permalink
Updated some out of date references to Go 1.14 (#912)
Browse files Browse the repository at this point in the history
  • Loading branch information
jalextowle authored Sep 14, 2020
1 parent 2776c43 commit 2ca2662
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
environment:
BASH_ENV: ~/.nvm/nvm.sh
docker:
- image: circleci/golang:1.14.3-browsers
- image: circleci/golang:1.15-browsers
- image: 0xorg/ganache-cli:istanbul
environment:
VERSION: 6.2.4
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ This changelog is a work in progress and may contain notes for versions which ha

### Features ✅

- Upgraded to Go 1.15 to fix fatal errors in the WebAssembly runtime [#911]
- Upgraded to Go 1.14, which contains several WebAssembly performance improvements [#815](https://github.com/0xProject/0x-mesh/pull/815).
- Reject orders that have taker addresses that are non-zero and are not whitelisted. [#896](https://github.com/0xProject/0x-mesh/pull/896).

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ the dropdown menu in the GitHub UI to select `development`.
## Prerequisites

- [GNU Make](https://www.gnu.org/software/make/) If you are using a Unix-like OS, you probably already have this.
- [Go version 1.14.x](https://golang.org/dl/) (or use [the version manager called "g"](https://github.com/stefanmaric/g)).
- [Go version 1.15.x](https://golang.org/dl/) (or use [the version manager called "g"](https://github.com/stefanmaric/g)).
- [Node.js version >=11](https://nodejs.org/en/download/) (or use the [nvm version manager](https://github.com/creationix/nvm)).
- [Yarn package manager](https://yarnpkg.com/en/).
- [golangci-lint version 1.27.0](https://github.com/golangci/golangci-lint#install-golangci-lint).
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/mesh-bootstrap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# mesh-builder produces a statically linked binary
FROM golang:1.14.3-alpine3.11 as mesh-builder
FROM golang:1.15.0-alpine3.12 as mesh-builder


RUN apk update && apk add ca-certificates nodejs-current npm make git dep gcc build-base musl linux-headers
Expand All @@ -16,7 +16,7 @@ ADD . ./
RUN go build ./cmd/mesh-bootstrap

# Final Image
FROM alpine:3.11
FROM alpine:3.12

RUN apk update && apk add ca-certificates --no-cache

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/mesh-bridge/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# mesh-builder produces a statically linked binary
FROM golang:1.14.3-alpine3.11 as mesh-builder
FROM golang:1.15.0-alpine3.12 as mesh-builder


RUN apk update && apk add ca-certificates nodejs-current npm make git dep gcc build-base musl linux-headers
Expand All @@ -16,7 +16,7 @@ ADD . ./
RUN go build ./cmd/mesh-bridge

# Final Image
FROM alpine:3.11
FROM alpine:3.12

RUN apk update && apk add ca-certificates --no-cache

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/mesh/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# mesh-builder produces a statically linked binary
FROM golang:1.14.3-alpine3.11 as mesh-builder
FROM golang:1.15.0-alpine3.12 as mesh-builder


RUN apk update && apk add ca-certificates nodejs-current npm make git dep gcc build-base musl linux-headers
Expand All @@ -16,7 +16,7 @@ ADD . ./
RUN go build ./cmd/mesh

# Final Image
FROM alpine:3.11
FROM alpine:3.12

RUN apk update && apk add ca-certificates --no-cache

Expand Down

0 comments on commit 2ca2662

Please sign in to comment.