From 6887db02f7d0313cba00ae78efe17eef69260e97 Mon Sep 17 00:00:00 2001
From: Harold Wanyama <hwanyama@contractor.linuxfoundation.org>
Date: Wed, 5 Jun 2024 17:59:20 +0300
Subject: [PATCH] Bug/Go Dependecies

- Tidy up go dependencies

Signed-off-by: Harold Wanyama <hwanyama@contractor.linuxfoundation.org>
---
 .github/workflows/build-pr.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 43a650806..06eb0232b 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -36,14 +36,15 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-go-
 
       - name: Configure Git to clone private Github repos
-        run: git config --global url."https://${TOKEN}@github.com".insteadOf "https://github.com"
+        run: git config --global url."https://${TOKEN_USER}:${TOKEN}@github.com".insteadOf "https://github.com"
         env:
           TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          TOKEN_USER: ${{ secrets.PERSONAL_ACCESS_TOKEN_USER }}
 
       - name: Add OS Tools
         run: sudo apt update && sudo apt-get install file -y
@@ -77,7 +78,10 @@ jobs:
 
       - name: Go Dependencies
         working-directory: cla-backend-go
-        run: make deps
+        run: |
+          go mod tidy
+          go mod download
+          make deps
 
       - name: Go Swagger Generate
         working-directory: cla-backend-go