Update Go version to 1.22.4
Includes fix for a symlink race on remove. Updates 1.21 to 1.21.11 for runc install which also includes the symlink fix. Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
		
							
								
								
									
										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.22.3" | ||||
|     default: "1.22.4" | ||||
|     description: "Go version to install" | ||||
|  | ||||
| runs: | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/api-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/api-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -6,7 +6,7 @@ on: | ||||
| name: API Release | ||||
|  | ||||
| env: | ||||
|   GO_VERSION: "1.22.3" | ||||
|   GO_VERSION: "1.22.4" | ||||
|  | ||||
| permissions: # added using https://github.com/step-security/secure-workflows | ||||
|   contents: read | ||||
|   | ||||
							
								
								
									
										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.22.3"] | ||||
|         go-version: ["1.22.4"] | ||||
|         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.22.3" | ||||
|   GO_VERSION: "1.22.4" | ||||
|  | ||||
| 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.22.3", | ||||
|         'GO_VERSION': ENV['GO_VERSION'] || "1.22.4", | ||||
|     } | ||||
|     sh.inline = <<~SHELL | ||||
|         #!/usr/bin/env bash | ||||
|   | ||||
| @@ -29,7 +29,7 @@ | ||||
| #   docker run --privileged containerd-test | ||||
| # ------------------------------------------------------------------------------ | ||||
|  | ||||
| ARG GOLANG_VERSION=1.22.3 | ||||
| ARG GOLANG_VERSION=1.22.4 | ||||
| ARG GOLANG_IMAGE=golang | ||||
|  | ||||
| FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang | ||||
|   | ||||
| @@ -43,11 +43,11 @@ go run main.go --target_dir $SRC/containerd/images | ||||
|  | ||||
| apt-get update && apt-get install -y wget | ||||
| cd $SRC | ||||
| wget --quiet https://go.dev/dl/go1.22.3.linux-amd64.tar.gz | ||||
| wget --quiet https://go.dev/dl/go1.22.4.linux-amd64.tar.gz | ||||
|  | ||||
| mkdir temp-go | ||||
| rm -rf /root/.go/* | ||||
| tar -C temp-go/ -xzf go1.22.3.linux-amd64.tar.gz | ||||
| tar -C temp-go/ -xzf go1.22.4.linux-amd64.tar.gz | ||||
| mv temp-go/go/* /root/.go/ | ||||
| cd $SRC/containerd | ||||
|  | ||||
|   | ||||
| @@ -38,8 +38,8 @@ function install_runc() { | ||||
| 	# https://github.com/opencontainers/runc/issues/4233 | ||||
| 	GO121DIR="${TMPROOT}"/go121 | ||||
| 	mkdir -p "${GO121DIR}" | ||||
| 	GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.9@latest | ||||
| 	GO121="${GO121DIR}"/go1.21.9 | ||||
| 	GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.11@latest | ||||
| 	GO121="${GO121DIR}"/go1.21.11 | ||||
| 	$GO121 download | ||||
| 	git clone "${RUNC_REPO}" "${TMPROOT}"/runc | ||||
| 	pushd "${TMPROOT}"/runc | ||||
|   | ||||
| @@ -5,7 +5,7 @@ | ||||
| # lived test environment. | ||||
| Set-MpPreference -DisableRealtimeMonitoring:$true | ||||
|  | ||||
| $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.3"; make = ""; nssm = "" } | ||||
| $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.4"; make = ""; nssm = "" } | ||||
|  | ||||
| Write-Host "Downloading chocolatey package" | ||||
| curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip' | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Derek McGowan
					Derek McGowan