From 34596c9c906d964b52a2ac7cfb8bae724c52aae2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 8 Aug 2020 15:10:30 +0200 Subject: [PATCH] Bump Golang 1.13.15 full diff: https://github.com/golang/go/compare/go1.13.14...go1.13.15 go1.13.15 (released 2020/08/06) includes security fixes to the encoding/binary package. See the Go 1.13.15 milestone on the issue tracker for details. https://github.com/golang/go/issues?q=milestone%3AGo1.13.15+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn --- .appveyor.yml | 2 +- .github/workflows/ci.yml | 8 ++++---- README.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b6e206097..4912045ff 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,7 +10,7 @@ environment: CGO_ENABLED: 1 GO111MODULE: off matrix: - - GO_VERSION: 1.13.14 + - GO_VERSION: 1.13.15 install: # Install Mingw diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f2b11a91..bc337ee94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.14' + go-version: '1.13.15' - name: Set env shell: bash @@ -82,7 +82,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: '1.13.14' + go-version: '1.13.15' - name: Set env shell: bash @@ -147,10 +147,10 @@ jobs: name: Build and CRI Test (Windows amd64) runs-on: windows-2016 steps: - - name: Set up Go 1.13.14 + - name: Set up Go 1.13.15 uses: actions/setup-go@v1 with: - go-version: 1.13.14 + go-version: 1.13.15 - name: Checkout cri repo uses: actions/checkout@v2 diff --git a/README.md b/README.md index 2eac02109..e421077b2 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ specifications as appropriate. backport version of `libseccomp-dev` is required. See [travis.yml](.travis.yml) for an example on trusty. * **btrfs development library.** Required by containerd btrfs support. `btrfs-tools`(Ubuntu, Debian) / `btrfs-progs-devel`(Fedora, CentOS, RHEL) 2. Install **`pkg-config`** (required for linking with `libseccomp`). -3. Install and setup a Go 1.13.14 development environment. +3. Install and setup a Go 1.13.15 development environment. 4. Make a local clone of this repository. 5. Install binary dependencies by running the following command from your cloned `cri/` project directory: ```bash