From d7c2513ff3bf862cc800d93b4fb7cfac1e1d7102 Mon Sep 17 00:00:00 2001
From: Phil Estes <estesp@linux.vnet.ibm.com>
Date: Tue, 7 Apr 2020 15:44:25 -0400
Subject: [PATCH] Update integration test timeout

Also few changes to names of workflow jobs. Integration tests can get
canceled without full completing at 10 minutes. Make sure we only use
checkout v2 action.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
---
 .github/workflows/ci.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 595962d13..762f82af8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
   # Project checks
   #
   project:
-    name: Project
+    name: Project Checks
     runs-on: ubuntu-18.04
     timeout-minutes: 5
 
@@ -140,18 +140,21 @@ jobs:
         with:
           go-version: '1.13.9'
 
+      - name: Set env
+        shell: bash
+        run: |
+          echo "::set-env name=GOPATH::${{ github.workspace }}"
+          echo "::add-path::${{ github.workspace }}/bin"
+
       - name: Checkout
-        uses: actions/checkout@v1
-        env:
-          GOPATH: ${{ runner.workspace }}
-          GO111MODULE: off
+        uses: actions/checkout@v2
         with:
-          path: ./src/github.com/containerd/containerd
+          path: src/github.com/containerd/containerd
 
       - name: Install protobuf
         env:
-          GOPATH: ${{ runner.workspace }}
           GO111MODULE: off
+        working-directory: src/github.com/containerd/containerd
         run: |
           sudo env PATH=$PATH GOPATH=$GOPATH script/setup/install-protobuf
           sudo chmod +x /usr/local/bin/protoc
@@ -161,27 +164,26 @@ jobs:
 
       - name: Go get gogo
         env:
-          GOPATH: ${{ runner.workspace }}
           GO111MODULE: off
         # Get proto files, ignore "package github.com/gogo/googleapis: no Go files in ~/go/src/github.com/gogo/googleapis"
         run: go get -u github.com/gogo/googleapis || true
 
       - name: Install dev tools
         env:
-          GOPATH: ${{ runner.workspace }}
           GO111MODULE: off
         run: script/setup/install-dev-tools
+        working-directory: src/github.com/containerd/containerd
 
       - name: Make
         env:
-          GOPATH: ${{ runner.workspace }}
           GO111MODULE: off
+        working-directory: src/github.com/containerd/containerd
         run: |
           export PATH=$PATH:$(go env GOPATH)/bin
           make check-protos check-api-descriptors
 
   man:
-    name: Mans
+    name: Manpages
     runs-on: ubuntu-18.04
     timeout-minutes: 5
 
@@ -256,7 +258,7 @@ jobs:
   integration:
     name: Integration
     runs-on: ubuntu-18.04
-    timeout-minutes: 10
+    timeout-minutes: 15
     needs: [project, linters, protos, man]
 
     strategy: