Merge pull request #4050 from thaJeztah/bump_golang_1.14
Update to golang 1.15.2
This commit is contained in:
commit
5b3ac0c86f
14
.github/workflows/ci.yml
vendored
14
.github/workflows/ci.yml
vendored
@ -26,7 +26,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
@ -66,7 +66,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
@ -138,7 +138,7 @@ jobs:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
@ -185,7 +185,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
@ -222,7 +222,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
@ -254,7 +254,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
@ -325,7 +325,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Setup gosu
|
||||
shell: bash
|
||||
|
4
.github/workflows/nightly.yml
vendored
4
.github/workflows/nightly.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v1
|
||||
@ -126,7 +126,7 @@ jobs:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v1
|
||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -62,7 +62,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: '1.13.15'
|
||||
go-version: '1.15.2'
|
||||
|
||||
- name: Set env
|
||||
shell: bash
|
||||
|
@ -15,7 +15,7 @@ os:
|
||||
- linux
|
||||
|
||||
go:
|
||||
- "1.13.15"
|
||||
- "1.15.2"
|
||||
|
||||
env:
|
||||
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct
|
||||
|
@ -2,7 +2,7 @@
|
||||
become: yes
|
||||
roles:
|
||||
- role: config-golang
|
||||
go_version: '1.13.15'
|
||||
go_version: '1.15.2'
|
||||
arch: arm64
|
||||
tasks:
|
||||
- name: Build containerd
|
||||
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
|
||||
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
|
||||
sh.upload_path = "/tmp/vagrant-install-golang"
|
||||
sh.env = {
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.13.15",
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.15.2",
|
||||
}
|
||||
sh.inline = <<~SHELL
|
||||
#!/usr/bin/env bash
|
||||
|
@ -6,7 +6,7 @@
|
||||
# 3.) $ make binaries install test
|
||||
#
|
||||
|
||||
ARG GOLANG_VERSION=1.13.15
|
||||
ARG GOLANG_VERSION=1.15.2
|
||||
|
||||
FROM golang:${GOLANG_VERSION} AS golang-base
|
||||
RUN mkdir -p /go/src/github.com/containerd/containerd
|
||||
|
Loading…
Reference in New Issue
Block a user