Merge pull request #205 from moul/dev/moul/go115

chore: go1.15
This commit is contained in:
Manfred Touron 2020-08-19 20:28:55 +02:00 committed by GitHub
commit 83b54aeeff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View file

@ -1,7 +1,7 @@
defaults: &defaults
working_directory: /go/src/moul.io/sshportal
docker:
- image: circleci/golang:1.14.7
- image: circleci/golang:1.15.0
environment:
GO111MODULE: "on"
@ -27,6 +27,7 @@ jobs:
curl -L https://github.com/docker/compose/releases/download/1.11.4/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
- setup_remote_docker:
docker_layer_caching: true
version: 18.09.3 # https://github.com/golang/go/issues/40893
- *install_retry
- run: /tmp/retry -m 3 docker build -t moul/sshportal .
- run: /tmp/retry -m 3 make integration

View file

@ -30,8 +30,7 @@ jobs:
strategy:
matrix:
golang:
#- 1.13
- 1.14
- 1.15.0
steps:
- uses: actions/checkout@v2
- name: Install Go
@ -47,7 +46,7 @@ jobs:
strategy:
matrix:
golang:
- 1.14
- 1.15.0
steps:
- uses: actions/checkout@v2
- name: Install Go
@ -72,6 +71,7 @@ jobs:
- 1.12
- 1.13
- 1.14
- 1.15.0
steps:
- uses: actions/checkout@v2
- name: Install Go

View file

@ -1,5 +1,5 @@
# build
FROM golang:1.14.7 as builder
FROM golang:1.15.0 as builder
ENV GO111MODULE=on
WORKDIR /go/src/moul.io/sshportal
COPY go.mod go.sum ./