Merge pull request #9072 from thaJeztah/update_golang_1.21.1

update to go1.21.1, go1.20.8
This commit is contained in:
Fu Wei 2023-09-09 12:41:14 +08:00 committed by GitHub
commit 40f8ce622b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 12 deletions

View File

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

View File

@ -9,7 +9,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.21.0"
GO_VERSION: "1.21.1"
permissions: # added using https://github.com/step-security/secure-workflows
contents: read
@ -209,7 +209,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, macos-12, windows-2019, windows-2022]
go-version: ["1.20.7", "1.21.0"]
go-version: ["1.20.8", "1.21.1"]
steps:
- uses: actions/setup-go@v4
with:

View File

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

View File

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

View File

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

View File

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

2
Vagrantfile vendored
View File

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

View File

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

View File

@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images
apt-get update && apt-get install -y wget
cd $SRC
wget --quiet https://go.dev/dl/go1.21.0.linux-amd64.tar.gz
wget --quiet https://go.dev/dl/go1.21.1.linux-amd64.tar.gz
mkdir temp-go
rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.21.0.linux-amd64.tar.gz
tar -C temp-go/ -xzf go1.21.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.21.0"; make = ""; nssm = "" }
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.1"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'