Update Go to 1.16.14, 1.17.7
Includes security fixes for crypto/elliptic (CVE-2022-23806), math/big (CVE-2022-23772), and cmd/go (CVE-2022-23773). go1.17.7 (released 2022-02-10) includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. See the Go 1.17.7 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved full diff: https://github.com/golang/go/compare/go1.17.6...go1.17.7 Update Go to 1.17.6 go1.17.6 (released 2022-01-06) includes fixes to the compiler, linker, runtime, and the crypto/x509, net/http, and reflect packages. See the Go 1.17.6 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.17.6+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/build-test-images.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build-test-images.yml
									
									
									
									
										vendored
									
									
								
							| @@ -39,7 +39,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										18
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -20,7 +20,7 @@ jobs: | |||||||
|  |  | ||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         go-version: [1.17.5] |         go-version: [1.17.7] | ||||||
|         os: [ubuntu-18.04, macos-10.15, windows-2019] |         os: [ubuntu-18.04, macos-10.15, windows-2019] | ||||||
|  |  | ||||||
|     steps: |     steps: | ||||||
| @@ -46,7 +46,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -78,7 +78,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -110,7 +110,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 |       - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 | ||||||
|       - run: make man |       - run: make man | ||||||
| @@ -144,7 +144,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - run: | |       - run: | | ||||||
|           set -e -x |           set -e -x | ||||||
| @@ -201,7 +201,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] |         os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] | ||||||
|         go-version: ['1.16.13', '1.17.5'] |         go-version: ['1.16.14', '1.17.7'] | ||||||
|  |  | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
| @@ -248,7 +248,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -330,7 +330,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |  | ||||||
| @@ -449,7 +449,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - run: sudo -E PATH=$PATH script/setup/install-gotestsum |       - run: sudo -E PATH=$PATH script/setup/install-gotestsum | ||||||
|       - name: Tests |       - name: Tests | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/codeql.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/codeql.yml
									
									
									
									
										vendored
									
									
								
							| @@ -26,7 +26,7 @@ jobs: | |||||||
|  |  | ||||||
|     - uses: actions/setup-go@v2 |     - uses: actions/setup-go@v2 | ||||||
|       with: |       with: | ||||||
|         go-version: 1.17.5 |         go-version: 1.17.7 | ||||||
|  |  | ||||||
|     # Initializes the CodeQL tools for scanning. |     # Initializes the CodeQL tools for scanning. | ||||||
|     - name: Initialize CodeQL |     - name: Initialize CodeQL | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/images.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/images.yml
									
									
									
									
										vendored
									
									
								
							| @@ -24,7 +24,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							| @@ -18,7 +18,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -135,7 +135,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -64,7 +64,7 @@ jobs: | |||||||
|       - name: Install Go |       - name: Install Go | ||||||
|         uses: actions/setup-go@v2 |         uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.17.5' |           go-version: '1.17.7' | ||||||
|       - name: Set env |       - name: Set env | ||||||
|         shell: bash |         shell: bash | ||||||
|         env: |         env: | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ | |||||||
|   become: yes |   become: yes | ||||||
|   roles: |   roles: | ||||||
|   - role: config-golang |   - role: config-golang | ||||||
|     go_version: '1.17.5' |     go_version: '1.17.7' | ||||||
|     arch: arm64 |     arch: arm64 | ||||||
|   tasks: |   tasks: | ||||||
|   - name: Build containerd |   - name: Build containerd | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							| @@ -77,7 +77,7 @@ Vagrant.configure("2") do |config| | |||||||
|   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.17.5", |         'GO_VERSION': ENV['GO_VERSION'] || "1.17.7", | ||||||
|     } |     } | ||||||
|     sh.inline = <<~SHELL |     sh.inline = <<~SHELL | ||||||
|         #!/usr/bin/env bash |         #!/usr/bin/env bash | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ | |||||||
| # | # | ||||||
| # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ | # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ | ||||||
|  |  | ||||||
| ARG GOLANG_VERSION=1.17.5 | ARG GOLANG_VERSION=1.17.7 | ||||||
| ARG GOLANG_IMAGE=golang | ARG GOLANG_IMAGE=golang | ||||||
|  |  | ||||||
| FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang | FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # Prepare windows environment for building and running containerd tests | # Prepare windows environment for building and running containerd tests | ||||||
|  |  | ||||||
| $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.5"; make = ""; nssm = "" } | $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.7"; 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' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Sebastiaan van Stijn
					Sebastiaan van Stijn