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

Merge pull request #8352 from thaJeztah/bump_go1.20.3

Browse Source 
update go to go1.20.3, go1.19.8
This commit is contained in:
Phil Estes 2023-04-05 11:17:49 -04:00 committed by GitHub
commit 3c6ddee128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-test-images.yml vendored
View File

@ -43,7 +43,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: "1.20.2" go-version: "1.20.3"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

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

@ -12,7 +12,7 @@ on:
env: env:
# Go version we currently use to build containerd across all CI. # 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. # Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
GO_VERSION: "1.20.2" GO_VERSION: "1.20.3"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read
@ -207,7 +207,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04, macos-12, windows-2019, windows-2022] os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
go-version: ["1.20.2", "1.19.7"] go-version: ["1.20.3", "1.19.8"]
steps: steps:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:

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

@ -34,7 +34,7 @@ jobs:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: 1.20.2 go-version: 1.20.3
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

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

@ -28,7 +28,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: "1.20.2" go-version: "1.20.3"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

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

@ -7,7 +7,7 @@ on:
- ".github/workflows/nightly.yml" - ".github/workflows/nightly.yml"
env: env:
GO_VERSION: "1.20.2" GO_VERSION: "1.20.3"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read

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

@ -13,7 +13,7 @@ on:
name: Release name: Release
env: env:
GO_VERSION: "1.20.2" GO_VERSION: "1.20.3"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read

2
Vagrantfile vendored
View File

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

2
contrib/Dockerfile.test
View File

@ -29,7 +29,7 @@
# docker run --privileged containerd-test # docker run --privileged containerd-test
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
ARG GOLANG_VERSION=1.20.2 ARG GOLANG_VERSION=1.20.3
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

2
docs/cri/crictl.md
View File

@ -324,7 +324,7 @@ $ crictl info
"rootDir": "/var/lib/containerd/io.containerd.grpc.v1.cri", "rootDir": "/var/lib/containerd/io.containerd.grpc.v1.cri",
"stateDir": "/run/containerd/io.containerd.grpc.v1.cri" "stateDir": "/run/containerd/io.containerd.grpc.v1.cri"
}, },
"golang": "go1.20.2", "golang": "go1.20.3",
"lastCNILoadStatus": "OK", "lastCNILoadStatus": "OK",
"lastCNILoadStatus.default": "OK" "lastCNILoadStatus.default": "OK"
} }

2
script/setup/prepare_env_windows.ps1
View File

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