From e557432f6412a661a40022ac0dc952e6c04aba2a Mon Sep 17 00:00:00 2001
From: Denis Isaev <denis@golangci.com>
Date: Wed, 7 Nov 2018 10:48:32 +0300
Subject: [PATCH] fix builds

---
 .circleci/config.yml       | 2 +-
 .golangci.yml              | 3 +++
 app/lib/executors/shell.go | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e38ca3b..ba1185b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     docker:
       # specify the version
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.11
       - image: redis
 
       # Specify service dependencies here if necessary
diff --git a/.golangci.yml b/.golangci.yml
index 84fbe37..ba6969e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -21,3 +21,6 @@ linters:
     - prealloc
     - dupl # temporary
     - gosec
+    - scopelint
+    - gochecknoglobals
+    - gochecknoinits
diff --git a/app/lib/executors/shell.go b/app/lib/executors/shell.go
index f22f11a..b62b605 100644
--- a/app/lib/executors/shell.go
+++ b/app/lib/executors/shell.go
@@ -138,8 +138,6 @@ func (s shell) runAsync(ctx context.Context, name string, args ...string) (int,
 		return 0, nil, nil, err
 	}
 
-	return cmd.Process.Pid, outReader, func() error {
-		// XXX: it's important to not change error here, because it holds exit code
-		return cmd.Wait()
-	}, nil
+  // XXX: it's important to not change error here, because it holds exit code
+	return cmd.Process.Pid, outReader, cmd.Wait, nil
 }