From 42a28ad2ca7faecfa3e2024952781136211c1fbf Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 7 Aug 2021 17:59:29 +0200 Subject: [PATCH] Update Go to 1.16.7 go1.16.7 (released 2021-08-05) includes a security fix to the net/http/httputil package, as well as bug fixes to the compiler, the linker, the runtime, the go command, and the net/http package. See the Go 1.16.7 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.16.7+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 2 +- .../containerd-build/integration-test.yaml | 2 +- .zuul/playbooks/containerd-build/run.yaml | 2 +- .../playbooks/containerd-build/unit-test.yaml | 2 +- Vagrantfile | 2 +- contrib/Dockerfile.test | 2 +- script/setup/prepare_env_windows.ps1 | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5b6f38fd..a5517d613 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - go-version: [1.16.6] + go-version: [1.16.7] os: [ubuntu-18.04, macos-10.15, windows-2019] steps: @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 with: @@ -73,7 +73,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 with: @@ -106,7 +106,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 - run: go get github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: make man @@ -140,7 +140,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 - run: | set -e -x @@ -197,7 +197,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15, windows-2019] - go-version: ['1.16.6'] + go-version: ['1.16.7'] steps: - uses: actions/setup-go@v2 @@ -239,7 +239,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 with: @@ -320,7 +320,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 @@ -439,7 +439,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 - run: sudo -E PATH=$PATH script/setup/install-gotestsum - name: Tests diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fef973954..ff16fbc39 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 with: @@ -135,7 +135,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48193cb48..4dc88ef9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.16.6' + go-version: '1.16.7' - name: Set env shell: bash diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml index d77b6c480..d74532571 100644 --- a/.zuul/playbooks/containerd-build/integration-test.yaml +++ b/.zuul/playbooks/containerd-build/integration-test.yaml @@ -2,7 +2,7 @@ become: yes roles: - role: config-golang - go_version: '1.16.3' + go_version: '1.16.7' arch: arm64 tasks: - name: Install pre-requisites diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml index 45e20f162..66de54a01 100644 --- a/.zuul/playbooks/containerd-build/run.yaml +++ b/.zuul/playbooks/containerd-build/run.yaml @@ -2,7 +2,7 @@ become: yes roles: - role: config-golang - go_version: '1.16.6' + go_version: '1.16.7' arch: arm64 tasks: - name: Build containerd diff --git a/.zuul/playbooks/containerd-build/unit-test.yaml b/.zuul/playbooks/containerd-build/unit-test.yaml index 03f8b67f4..8d64743cc 100644 --- a/.zuul/playbooks/containerd-build/unit-test.yaml +++ b/.zuul/playbooks/containerd-build/unit-test.yaml @@ -2,7 +2,7 @@ become: yes roles: - role: config-golang - go_version: '1.16.3' + go_version: '1.16.7' arch: arm64 tasks: - name: Build and test containerd diff --git a/Vagrantfile b/Vagrantfile index e61a14015..909c63dd3 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -77,7 +77,7 @@ Vagrant.configure("2") do |config| 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.16.6", + 'GO_VERSION': ENV['GO_VERSION'] || "1.16.7", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 2bb7ad603..0e5cf7b2a 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -10,7 +10,7 @@ # # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ -ARG GOLANG_VERSION=1.16.6 +ARG GOLANG_VERSION=1.16.7 ARG GOLANG_IMAGE=golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang diff --git a/script/setup/prepare_env_windows.ps1 b/script/setup/prepare_env_windows.ps1 index fbb70bd4c..60aafdb45 100644 --- a/script/setup/prepare_env_windows.ps1 +++ b/script/setup/prepare_env_windows.ps1 @@ -1,6 +1,6 @@ # Prepare windows environment for building and running containerd tests -$PACKAGES= @{ mingw = ""; git = ""; golang = "1.16.6"; make = "" } +$PACKAGES= @{ mingw = ""; git = ""; golang = "1.16.7"; make = "" } write-host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'