diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 433361fdfa64..c2944e0d0bd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - go-version: [1.16.11] + go-version: [1.16.12] os: [ubuntu-18.04, macos-10.15, windows-2019] steps: @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - shell: bash run: | @@ -82,7 +82,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - uses: actions/checkout@v2 with: @@ -115,7 +115,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - name: Set env shell: bash @@ -161,7 +161,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - name: Set env shell: bash run: | @@ -226,7 +226,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15, windows-2019] - go-version: ['1.16.11'] + go-version: ['1.16.12'] include: # Go 1.13.x is still used by Docker/Moby - go-version: '1.13.x' @@ -272,7 +272,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - uses: actions/checkout@v2 with: @@ -353,7 +353,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - uses: actions/checkout@v2 with: @@ -505,7 +505,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - uses: actions/checkout@v2 with: path: src/github.com/containerd/containerd diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1bbfac582b36..97320a1ac9a3 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.11' + go-version: '1.16.12' - uses: actions/checkout@v2 with: @@ -135,7 +135,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16.11' + go-version: '1.16.12' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc32dbb0d8e7..9ac831087bd4 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.11' + go-version: '1.16.12' - name: Set env shell: bash diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml index 29e23adbef0c..9496ece3bb1a 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.11' + go_version: '1.16.12' arch: arm64 tasks: - name: Install pre-requisites diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml index ef8668bd4339..a0ac088b8a98 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.11' + go_version: '1.16.12' 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 d88d4de2ab04..be354a3c7963 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.11' + go_version: '1.16.12' arch: arm64 tasks: - name: Build and test containerd diff --git a/Vagrantfile b/Vagrantfile index 2c29a3a9a263..2d790a774bca 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.11", + 'GO_VERSION': ENV['GO_VERSION'] || "1.16.12", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 6803249e655c..8637c4b8cf02 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-rc93 -f Dockerfile.test ../ -ARG GOLANG_VERSION=1.16.11 +ARG GOLANG_VERSION=1.16.12 FROM golang:${GOLANG_VERSION} AS golang-base RUN mkdir -p /go/src/github.com/containerd/containerd