diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b0357bd0..f9871b113 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - go-version: [1.17.1] + go-version: [1.17.2] os: [ubuntu-18.04, macos-10.15, windows-2019] steps: @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 with: @@ -78,7 +78,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 with: @@ -111,7 +111,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 - run: go get github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: make man @@ -145,7 +145,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 - run: | set -e -x @@ -202,7 +202,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15, windows-2019] - go-version: ['1.17.1'] + go-version: ['1.17.2'] steps: - uses: actions/setup-go@v2 @@ -244,7 +244,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 with: @@ -325,7 +325,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 @@ -444,7 +444,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 - run: sudo -E PATH=$PATH script/setup/install-gotestsum - name: Tests diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 55562a34f..195d33afc 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2831ee1ca..3795164d7 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.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 with: @@ -135,7 +135,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.1' + go-version: '1.17.2' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 42cb5324b..573c52e23 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.17.1' + go-version: '1.17.2' - name: Set env shell: bash diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml index 3ccdd96f6..efbd878e1 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.17.1' + go_version: '1.17.2' arch: arm64 tasks: - name: Install pre-requisites diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml index 2aef5a1b4..5e73817db 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.17.1' + go_version: '1.17.2' 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 dcae814a9..bf0ee7b47 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.17.1' + go_version: '1.17.2' arch: arm64 tasks: - name: Build and test containerd diff --git a/Vagrantfile b/Vagrantfile index 90310e822..b7190ac97 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.17.1", + 'GO_VERSION': ENV['GO_VERSION'] || "1.17.2", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index e552b6841..646905c53 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.17.1 +ARG GOLANG_VERSION=1.17.2 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 cdb0ca0fb..da3e91eac 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 = "10.2.0"; git = ""; golang = "1.17.1"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.2"; make = ""; nssm = "" } write-host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'