Skip to content

Commit afaa379

Browse files
committed
Revert "Update Go to 1.15.14"
This reverts commit 287fd67. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 4ce1ce6 commit afaa379

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install Go
2727
uses: actions/setup-go@v2
2828
with:
29-
go-version: '1.15.14'
29+
go-version: '1.15.13'
3030

3131
- name: Set env
3232
shell: bash
@@ -80,7 +80,7 @@ jobs:
8080
steps:
8181
- uses: actions/setup-go@v2
8282
with:
83-
go-version: '1.15.14'
83+
go-version: '1.15.13'
8484

8585
- name: Set env
8686
shell: bash
@@ -126,7 +126,7 @@ jobs:
126126
steps:
127127
- uses: actions/setup-go@v2
128128
with:
129-
go-version: '1.15.14'
129+
go-version: '1.15.13'
130130

131131
- name: Set env
132132
shell: bash
@@ -162,7 +162,7 @@ jobs:
162162
steps:
163163
- uses: actions/setup-go@v2
164164
with:
165-
go-version: '1.15.14'
165+
go-version: '1.15.13'
166166

167167
- name: Set env
168168
shell: bash
@@ -193,7 +193,7 @@ jobs:
193193
steps:
194194
- uses: actions/setup-go@v2
195195
with:
196-
go-version: '1.15.14'
196+
go-version: '1.15.13'
197197

198198
- name: Set env
199199
shell: bash
@@ -272,7 +272,7 @@ jobs:
272272
steps:
273273
- uses: actions/setup-go@v2
274274
with:
275-
go-version: '1.15.14'
275+
go-version: '1.15.13'
276276

277277
- name: Set env
278278
shell: bash

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: '1.15.14'
17+
go-version: '1.15.13'
1818

1919
- name: Checkout
2020
uses: actions/checkout@v1
@@ -134,7 +134,7 @@ jobs:
134134
steps:
135135
- uses: actions/setup-go@v2
136136
with:
137-
go-version: '1.15.14'
137+
go-version: '1.15.13'
138138

139139
- name: Checkout
140140
uses: actions/checkout@v1

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Install Go
6363
uses: actions/setup-go@v2
6464
with:
65-
go-version: '1.15.14'
65+
go-version: '1.15.13'
6666

6767
- name: Set env
6868
shell: bash

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ os:
1515
- linux
1616

1717
go:
18-
- "1.15.14"
18+
- "1.15.13"
1919

2020
env:
2121
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct

.zuul/playbooks/containerd-build/run.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
become: yes
33
roles:
44
- role: config-golang
5-
go_version: '1.15.14'
5+
go_version: '1.15.13'
66
arch: arm64
77
tasks:
88
- name: Build containerd

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
7777
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
7878
sh.upload_path = "/tmp/vagrant-install-golang"
7979
sh.env = {
80-
'GO_VERSION': ENV['GO_VERSION'] || "1.15.14",
80+
'GO_VERSION': ENV['GO_VERSION'] || "1.15.13",
8181
}
8282
sh.inline = <<~SHELL
8383
#!/usr/bin/env bash

contrib/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../
1212

13-
ARG GOLANG_VERSION=1.15.14
13+
ARG GOLANG_VERSION=1.15.13
1414

1515
FROM golang:${GOLANG_VERSION} AS golang-base
1616
RUN mkdir -p /go/src/github.com/containerd/containerd

0 commit comments

Comments
 (0)