From e1e6055351de15e0f8b1f3a829de5957b3483f46 Mon Sep 17 00:00:00 2001
From: HiteshRepo <pattanayak.hitesh03@gmail.com>
Date: Mon, 29 Jan 2024 13:17:59 +0530
Subject: [PATCH] same changes for trusted tests

---
 .github/workflows/ci.yml | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc36f1137..377e76309 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -138,21 +138,28 @@ jobs:
       AZURE_CLIENT_ID_NAME: ${{ needs.SetM365App.outputs.client_id_env }}
       AZURE_CLIENT_SECRET_NAME: ${{ needs.SetM365App.outputs.client_secret_env }}
       CLIENT_APP_SLOT: ${{ needs.SetM365App.outputs.client_app_slot }}
-      CORSO_LOG_FILE: ${{ github.workspace }}/src/testlog/run-ci.log
+      CORSO_LOG_FILE: /tmp/corso-trusted-testlog/run-ci.log
       LOG_GRAPH_REQUESTS: true
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Golang with cache
-        uses: magnetikonline/action-golang-cache@v4
+      - name: Setup Golang
+        uses: actions/setup-go@v5
         with:
-          go-version-file: src/go.mod
+          go-version: 1.21
+          cache: true
 
-      - run: mkdir testlog
+      - name: Setup Golang caches
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-golang-trusted-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-golang-trusted-
 
-      # Install gotestfmt
-      - name: Set up gotestfmt
-        run: go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
+      - run: mkdir -p /tmp/corso-trusted-testlog
 
       # AWS creds
       - name: Configure AWS credentials from Test account
@@ -177,21 +184,19 @@ jobs:
           set -euo pipefail
           go test       \
           -tags testing \
-          -json         \
-          -v            \
           -failfast     \
           -p 1          \
           -timeout 20m  \
           ./... \
-          2>&1 | tee ./testlog/gotest-ci.log | gotestfmt -hide successful-tests
+          2>&1 | tee /tmp/corso-trusted-testlog/gotest-ci.log
 
       # Upload the original go test output as an artifact for later review.
       - name: Upload test log
-        if: failure()
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: ci-test-log
-          path: src/testlog/*
+          path: /tmp/corso-trusted-testlog/*
           if-no-files-found: error
           retention-days: 14
 
@@ -298,9 +303,9 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-golang-${{ github.sha }}
+          key: ${{ runner.os }}-golang-unit-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-golang-
+            ${{ runner.os }}-golang-unit-
 
       - run: mkdir -p /tmp/corso-testlog