From 7fac6bf7662cd4a980a1c5d4a154f31b59487d66 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Tue, 30 Jun 2020 11:19:20 +0200
Subject: [PATCH] Avoid running build/tests/lint twice on master with
 master.yml

---
 .github/workflows/master-ci.yml | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml
index d45055d0a..359224969 100644
--- a/.github/workflows/master-ci.yml
+++ b/.github/workflows/master-ci.yml
@@ -6,28 +6,8 @@ on:
       - master
 
 jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    env:
-      GO111MODULE: "on"
-    steps:
-      - name: Set up Go 1.14
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.14
-        id: go
-
-      - name: Checkout code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Run golangci-lint
-        run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.27.0
-          ./golangci-lint run --timeout 10m0s
-
   build:
-    name: Build
+    name: ACI e2e tests
     runs-on: ubuntu-latest
     env:
       GO111MODULE: "on"
@@ -46,19 +26,11 @@ jobs:
           path: ~/go/pkg/mod
           key: go-${{ hashFiles('**/go.sum') }}
 
-      - name: Test
-        env:
-          BUILD_TAGS: example,local
-        run: make -f builder.Makefile test
-
-      - name: Build
+      - name: Build fro ACI e2e tests
         env:
           BUILD_TAGS: example,local
         run: make -f builder.Makefile cli
 
-      - name: E2E Test
-        run: make e2e-local
-
       - name: ACI e2e Test
         env:
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}