github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4050 from thaJeztah/bump_golang_1.14

Browse Source 
Update to golang 1.15.2
This commit is contained in:
Maksym Pavlenko 2020-09-14 09:42:13 -07:00 committed by GitHub
commit 5b3ac0c86f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/ci.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash
@ -66,7 +66,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash
@ -138,7 +138,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash
@ -185,7 +185,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash
@ -222,7 +222,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash
@ -254,7 +254,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash
@ -325,7 +325,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Setup gosu - name: Setup gosu
shell: bash shell: bash

4
.github/workflows/nightly.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
@ -126,7 +126,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1

2
.github/workflows/release.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: '1.13.15' go-version: '1.15.2'
- name: Set env - name: Set env
shell: bash shell: bash

2
.travis.yml
View File

@ -15,7 +15,7 @@ os:
- linux - linux
go: go:
- "1.13.15" - "1.15.2"
env: env:
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct

2
.zuul/playbooks/containerd-build/run.yaml
View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.13.15' go_version: '1.15.2'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build containerd - name: Build containerd

2
Vagrantfile vendored
View File

@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.13.15", 'GO_VERSION': ENV['GO_VERSION'] || "1.15.2",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

2
contrib/Dockerfile.test
View File

@ -6,7 +6,7 @@
# 3.) $ make binaries install test # 3.) $ make binaries install test
# #
ARG GOLANG_VERSION=1.13.15 ARG GOLANG_VERSION=1.15.2
FROM golang:${GOLANG_VERSION} AS golang-base FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd RUN mkdir -p /go/src/github.com/containerd/containerd