Merge pull request #7372 from thaJeztah/bump_golang_1.19.1

Update to go 1.19.1, 1.18.6 to address CVE-2022-27664, CVE-2022-32190
This commit is contained in:
Davanum Srinivas 2022-09-06 22:08:47 -04:00 committed by GitHub
commit 4a6d8d319b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 12 deletions

View File

@ -39,7 +39,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.19.1'
- uses: actions/checkout@v2
with:

View File

@ -12,7 +12,7 @@ on:
env:
# Go version we currently use to build containerd across all CI.
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
GO_VERSION: '1.19'
GO_VERSION: '1.19.1'
jobs:
#
@ -219,7 +219,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, macos-12, windows-2019, windows-2022]
go-version: ['1.19', '1.18.5']
go-version: ['1.19.1', '1.18.6']
steps:
- uses: actions/setup-go@v2
with:

View File

@ -26,7 +26,7 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: 1.19.1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL

View File

@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.19.1'
- uses: actions/checkout@v2
with:

View File

@ -7,7 +7,7 @@ on:
- '.github/workflows/nightly.yml'
env:
GO_VERSION: '1.19'
GO_VERSION: '1.19.1'
jobs:
linux:

View File

@ -6,7 +6,7 @@ on:
name: Containerd Release
env:
GO_VERSION: '1.19'
GO_VERSION: '1.19.1'
jobs:
check:

2
Vagrantfile vendored
View File

@ -97,7 +97,7 @@ EOF
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.19",
'GO_VERSION': ENV['GO_VERSION'] || "1.19.1",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash

View File

@ -10,7 +10,7 @@
#
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
ARG GOLANG_VERSION=1.19
ARG GOLANG_VERSION=1.19.1
ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

View File

@ -40,11 +40,11 @@ compile_fuzzers() {
apt-get update && apt-get install -y wget
cd $SRC
wget --quiet https://go.dev/dl/go1.19.linux-amd64.tar.gz
wget --quiet https://go.dev/dl/go1.19.1.linux-amd64.tar.gz
mkdir temp-go
rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.19.linux-amd64.tar.gz
tar -C temp-go/ -xzf go1.19.1.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/
cd $SRC/containerd

View File

@ -5,7 +5,7 @@
# lived test environment.
Set-MpPreference -DisableRealtimeMonitoring:$true
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.19"; make = ""; nssm = "" }
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.19.1"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'