From a19ad9bb6f9d4d5d0fba11fb6f42e72c4aaeaeb5 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 16 Mar 2022 16:56:06 +0000 Subject: [PATCH] Use Go 1.18 to build and test containerd Go 1.18 is released. Go 1.16 is no longer supported by the Go team. golangci-lint is updated since 1.44.2 doesn't support Go 1.18. Signed-off-by: Kazuyoshi Kato --- .github/workflows/build-test-images.yml | 2 +- .github/workflows/ci.yml | 21 ++++++++++----------- .github/workflows/codeql.yml | 2 +- .github/workflows/images.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 2 +- .zuul/playbooks/containerd-build/run.yaml | 2 +- Vagrantfile | 2 +- contrib/Dockerfile.test | 2 +- script/setup/prepare_env_windows.ps1 | 2 +- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml index f666d847b..00268f7e3 100644 --- a/.github/workflows/build-test-images.yml +++ b/.github/workflows/build-test-images.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 194513e73..60fe8fc83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - go-version: [1.17.8] + go-version: [1.18.0] os: [ubuntu-18.04, macos-10.15, windows-2019] steps: @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v2 - uses: golangci/golangci-lint-action@v3 with: - version: v1.44.2 + version: v1.45.0 skip-cache: true args: --timeout=5m @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: @@ -78,7 +78,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: @@ -110,7 +110,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: make man @@ -144,7 +144,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 - run: | set -e -x @@ -201,8 +201,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] - go-version: ['1.16.15', '1.17.8'] - + go-version: ['1.17.8', '1.18.0'] steps: - uses: actions/setup-go@v2 with: @@ -248,7 +247,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: @@ -370,7 +369,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 @@ -489,7 +488,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 - run: sudo -E PATH=$PATH script/setup/install-gotestsum - name: Tests diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9f91b8a7f..fdcf6fd85 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.18.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 83e110445..aa2d7fea2 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.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9734431dc..ec7eff0f0 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.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: @@ -135,7 +135,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 457b63618..0a90684ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,7 +64,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.18.0' - name: Set env shell: bash env: diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml index f9428891b..6cb60c6b5 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.8' + go_version: '1.18' arch: arm64 tasks: - name: Build containerd diff --git a/Vagrantfile b/Vagrantfile index 3e8e46619..fe7799693 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.8", + 'GO_VERSION': ENV['GO_VERSION'] || "1.18", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 475845922..27d7946c1 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.8 +ARG GOLANG_VERSION=1.18 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 412d68de8..59239da69 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.8"; make = ""; nssm = "" } +$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18"; make = ""; nssm = "" } Write-Host "Downloading chocolatey package" curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'