Merge pull request #10104 from thaJeztah/go1.21.9
update to go1.21.9, go1.22.2
This commit is contained in:
commit
6d1ae8b439
2
.github/actions/install-go/action.yml
vendored
2
.github/actions/install-go/action.yml
vendored
@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
|
||||
inputs:
|
||||
go-version:
|
||||
required: true
|
||||
default: "1.21.8"
|
||||
default: "1.21.9"
|
||||
description: "Go version to install"
|
||||
|
||||
runs:
|
||||
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -191,7 +191,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-22.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022]
|
||||
go-version: ["1.21.8", "1.22.1"]
|
||||
go-version: ["1.21.9", "1.22.2"]
|
||||
exclude:
|
||||
- os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }}
|
||||
steps:
|
||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -13,7 +13,7 @@ on:
|
||||
name: Release
|
||||
|
||||
env:
|
||||
GO_VERSION: "1.21.8"
|
||||
GO_VERSION: "1.21.9"
|
||||
|
||||
permissions: # added using https://github.com/step-security/secure-workflows
|
||||
contents: read
|
||||
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -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.8",
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.21.9",
|
||||
}
|
||||
sh.inline = <<~SHELL
|
||||
#!/usr/bin/env bash
|
||||
|
@ -29,7 +29,7 @@
|
||||
# docker run --privileged containerd-test
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
ARG GOLANG_VERSION=1.21.8
|
||||
ARG GOLANG_VERSION=1.21.9
|
||||
ARG GOLANG_IMAGE=golang
|
||||
|
||||
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
|
||||
|
@ -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.8.linux-amd64.tar.gz
|
||||
wget --quiet https://go.dev/dl/go1.21.9.linux-amd64.tar.gz
|
||||
|
||||
mkdir temp-go
|
||||
rm -rf /root/.go/*
|
||||
tar -C temp-go/ -xzf go1.21.8.linux-amd64.tar.gz
|
||||
tar -C temp-go/ -xzf go1.21.9.linux-amd64.tar.gz
|
||||
mv temp-go/go/* /root/.go/
|
||||
cd $SRC/containerd
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
# lived test environment.
|
||||
Set-MpPreference -DisableRealtimeMonitoring:$true
|
||||
|
||||
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.8"; make = ""; nssm = "" }
|
||||
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.9"; make = ""; nssm = "" }
|
||||
|
||||
Write-Host "Downloading chocolatey package"
|
||||
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'
|
||||
|
Loading…
Reference in New Issue
Block a user