diff --git a/.argo-ci/ci.yaml b/.argo-ci/ci.yaml
index 5009e25fb509d..b249d33b0c626 100644
--- a/.argo-ci/ci.yaml
+++ b/.argo-ci/ci.yaml
@@ -56,7 +56,7 @@ spec:
     container:
       image: argoproj/argo-cd-ci-builder:latest
       command: [sh, -c]
-      args: ["{{inputs.parameters.cmd}} | tee /tmp/logs.txt"]
+      args: ["mkfifo pipe; tee /tmp/logs.txt < pipe & {{inputs.parameters.cmd}} > pipe"]
       workingDir: /go/src/github.com/argoproj/argo-cd
       env:
         - name: COVERALLS_TOKEN
@@ -86,7 +86,7 @@ spec:
     container:
       image: argoproj/argo-cd-ci-builder:latest
       command: [sh, -c]
-      args: ["until docker ps; do sleep 3; done && {{inputs.parameters.cmd}} | tee /tmp/logs.txt"]
+      args: ["mkfifo pipe; tee /tmp/logs.txt < pipe & until docker ps; do sleep 3; done && {{inputs.parameters.cmd}} > pipe"]
       workingDir: /go/src/github.com/argoproj/argo-cd
       env:
       - name: DOCKER_HOST
@@ -104,4 +104,4 @@ spec:
     outputs:
       artifacts:
       - name: logs
-        path: /tmp/logs.txt
\ No newline at end of file
+        path: /tmp/logs.txt
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
index 83a098a121893..2b0d8c951686a 100644
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -21,9 +21,9 @@ import (
 	"github.com/argoproj/argo-cd/util/cache"
 	"github.com/argoproj/argo-cd/util/git"
 	"github.com/argoproj/argo-cd/util/helm"
-	"github.com/argoproj/argo-cd/util/kustomize"
 	"github.com/argoproj/argo-cd/util/ksonnet"
 	"github.com/argoproj/argo-cd/util/kube"
+	"github.com/argoproj/argo-cd/util/kustomize"
 )
 
 const (
diff --git a/server/application/application.go b/server/application/application.go
index cae7df33db9fb..36bd233d0d27e 100644
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -546,7 +546,6 @@ func recurseResourceNode(name, apiVersion, kind string, nodes []appv1.ResourceNo
 	return nil
 }
 
-
 func (s *Server) PodLogs(q *ApplicationPodLogsQuery, ws ApplicationService_PodLogsServer) error {
 	a, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Get(*q.Name, metav1.GetOptions{})
 	if err != nil {