From 02596d2758154961247d5511937819774405f68e Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Mon, 9 Sep 2019 09:59:29 -0700 Subject: [PATCH 1/2] need to move up to a more recent golang Signed-off-by: Mike Brown --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67d16536f..59e2769c5 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,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.10 development environment. +2. Install and setup a go 1.12.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 From da03c5bb9ac9c8319f66fd5b92f784e10c676e6c Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Mon, 9 Sep 2019 10:37:11 -0700 Subject: [PATCH 2/2] remove integration files from lint verify Signed-off-by: Mike Brown --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4e6079963..9140a14b4 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ version: ## print current cri plugin release version lint: @echo "$(WHALE) $@" - golangci-lint run --skip-files .*_test.go + golangci-lint run --skip-files .*_test.go --skip-dirs='(integration)' gofmt: @echo "$(WHALE) $@"