From 664acc1396baec7f58bfc71e2de7a415eabd5cd2 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 24 Mar 2020 22:06:18 -0400 Subject: [PATCH] Bump golang to v1.13.9 and v1.14.1 Signed-off-by: Rui Chen --- .appveyor.yml | 2 +- .travis.yml | 9 ++------- README.md | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d0c49679b..f105235d6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,7 +10,7 @@ environment: CGO_ENABLED: 1 GO111MODULE: off matrix: - - GO_VERSION: 1.13.8 + - GO_VERSION: 1.13.9 install: # Install Mingw diff --git a/.travis.yml b/.travis.yml index a9dec6de6..338d1eaa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,8 @@ git: language: go go: - - 1.13.8 - - 1.14 - -matrix: - - go: 1.14 - -sudo: required + - 1.13.9 + - 1.14.1 env: - GO111MODULE=off diff --git a/README.md b/README.md index 7d5c5ba9f..071173658 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 **`socat`** (required by portforward). -2. Install and setup a go 1.13.8 development environment. (Note: You can check the travis logs for a recent pull request to confirm the version(s) of golang currently being used to build and test master.) +2. Install and setup a go 1.13.9 development environment. (Note: You can check the travis logs for a recent pull request to confirm the version(s) of golang currently being used to build and test master.) 3. Make a local clone of this repository. 4. Install binary dependencies by running the following command from your cloned `cri/` project directory: ```bash