chore: go1.15

This commit is contained in:
Manfred Touron 2020-08-19 18:30:10 +02:00
parent 4c947ce391
commit 2323d6fd1e
No known key found for this signature in database
GPG key ID: 615D26EDFC55B351
3 changed files with 6 additions and 5 deletions

View file

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

View file

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

View file

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