diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50db099e8..e1256de73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash @@ -66,7 +66,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash @@ -138,7 +138,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash @@ -185,7 +185,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash @@ -222,7 +222,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash @@ -254,7 +254,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash @@ -325,7 +325,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Setup gosu shell: bash diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b84dfb03a..7e1baaad6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Checkout uses: actions/checkout@v1 @@ -126,7 +126,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Checkout uses: actions/checkout@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c2f933dc..243c7d5d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.15' + go-version: '1.15.2' - name: Set env shell: bash diff --git a/.travis.yml b/.travis.yml index 663cc803d..2791ee716 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ os: - linux go: - - "1.13.15" + - "1.15.2" env: - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml index 258889934..d537d51ea 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.13.15' + go_version: '1.15.2' arch: arm64 tasks: - name: Build containerd diff --git a/Vagrantfile b/Vagrantfile index fac9586fa..3d7f61515 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.13.15", + 'GO_VERSION': ENV['GO_VERSION'] || "1.15.2", } sh.inline = <<~SHELL #!/usr/bin/env bash diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index e46d66faf..f55628e1b 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -6,7 +6,7 @@ # 3.) $ make binaries install test # -ARG GOLANG_VERSION=1.13.15 +ARG GOLANG_VERSION=1.15.2 FROM golang:${GOLANG_VERSION} AS golang-base RUN mkdir -p /go/src/github.com/containerd/containerd