From b594ec05e6203a9d538edd6d30972d7925240114 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Tue, 11 Aug 2020 20:14:51 -0400 Subject: [PATCH] fix #1195 --- .travis.yml | 2 +- DEVELOPING.md | 2 +- Dockerfile | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f03c4a7..db22526a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - "1.14.x" + - "1.15.x" before_install: # https://github.com/travis-ci/travis-ci/issues/8361 diff --git a/DEVELOPING.md b/DEVELOPING.md index aaa89901..f3d6fd3b 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -12,7 +12,7 @@ Oragono vendors all its dependencies. Because of this, Oragono is self-contained If you're upgrading the Go version used by Oragono, there are several places where it's hard-coded and must be changed: 1. `.travis.yml`, which controls the version that our CI test suite uses to build and test the code (e.g., for a PR) -2. `distrib/docker/Dockerfile`, which controls the version that the Oragono binaries in our Docker images are built with +2. `Dockerfile`, which controls the version that the Oragono binaries in our Docker images are built with 3. `go.mod`: this should be updated automatically by Go when you do module-related operations diff --git a/Dockerfile b/Dockerfile index 91463d8a..0c6ab6c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ## build Oragono -FROM golang:1.14-alpine AS build-env +FROM golang:1.15-alpine AS build-env RUN apk add --no-cache git make curl sed diff --git a/go.mod b/go.mod index ac9f0bb1..7fa4d5b3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/oragono/oragono -go 1.14 +go 1.15 require ( code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48