From 2a2728b0a1ce534b34f95087a0f13b17e0a58b69 Mon Sep 17 00:00:00 2001
From: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
Date: Fri, 15 Oct 2021 16:15:57 +0300
Subject: [PATCH] Fix CI

- We need to initialize the native Terraform repo first

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
---
 .github/workflows/ci.yml | 11 ++++++-----
 .golangci.yml            |  2 +-
 Makefile                 |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e628f251..b4524b4cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make provider-tf-azure.vendor vendor.check
 
       # Go version coming with golangci-lint-action may not be our desired
       # go version. We deploy our desired go version and then skip go
@@ -82,6 +82,7 @@ jobs:
         with:
           version: ${{ env.GOLANGCI_VERSION }}
           skip-go-installation: true
+          args: --timeout 10m
 
   check-diff:
     runs-on: ubuntu-18.04
@@ -118,7 +119,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make provider-tf-azure.vendor vendor.check
 
       - name: Check Diff
         run: make check-diff
@@ -161,7 +162,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make provider-tf-azure.vendor vendor.check
 
       - name: Run Unit Tests
         run: make -j2 test
@@ -222,7 +223,7 @@ jobs:
             ${{ runner.os }}-pkg-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make provider-tf-azure.vendor vendor.check
 
       - name: Build Helm Chart
         run: make -j2 build
@@ -283,7 +284,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Vendor Dependencies
-        run: make vendor vendor.check
+        run: make provider-tf-azure.vendor vendor.check
 
       - name: Build Artifacts
         run: make -j2 build.all
diff --git a/.golangci.yml b/.golangci.yml
index ebeba478d..abb26f122 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  deadline: 2m
+  deadline: 10m
 
   skip-files:
   - "zz_generated\\..+\\.go$"
diff --git a/Makefile b/Makefile
index 6f1593454..f91e1ea8f 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ reviewable: prepare.azurerm
 test: prepare.azurerm
 generate: codegen.pipeline
 build: prepare.azurerm
-
+provider-tf-azure.vendor: prepare.azurerm vendor
 
 # must match Docker build file env. variable TERRAFORM_PROVIDER_AZURERM_VERSION in
 # cluster/images/provider-tf-azure-controller/Dockerfile