From 25728988b5de5ba0de7689eecebe8521ceac0fe2 Mon Sep 17 00:00:00 2001
From: Yashvi Jain <yashvi.jain@progress.com>
Date: Mon, 30 Dec 2024 12:41:47 +0530
Subject: [PATCH] Adding fix for repo health

Signed-off-by: Yashvi Jain <yashvi.jain@progress.com>
---
 .expeditor/verify.pipeline.yml | 1 -
 .studio/common                 | 4 +++-
 .studio/protobuf               | 3 ++-
 scripts/repo_health.sh         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 55cc4ada715..d4e8c71ae50 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -21,7 +21,6 @@ steps:
   #
   - label: "[codegen] A2 protobufs"
     command:
-      - git config --global --add safe.directory /go/src/github.com/chef/automate
       - hab studio run "source .studiorc && verify_all_protobuf_components"
     timeout_in_minutes: 10
     soft_fail: true
diff --git a/.studio/common b/.studio/common
index 6b4d521b342..6bf193cdb94 100644
--- a/.studio/common
+++ b/.studio/common
@@ -63,7 +63,9 @@ document "verify_products_generation" <<DOC
 DOC
 function verify_products_generation() {
   install_if_missing core/git git
-
+  git config --global --add safe.directory /go/src/github.com/chef/automate
+  git config --global --add safe.directory '*'
+  
   deployment_generate || return $?
 
   git add .
diff --git a/.studio/protobuf b/.studio/protobuf
index 2c1eeb68946..19a83536c32 100644
--- a/.studio/protobuf
+++ b/.studio/protobuf
@@ -240,7 +240,8 @@ document "verify_all_protobuf_components" <<DOC
 DOC
 function verify_all_protobuf_components() {
   install_if_missing core/git git
-
+  git config --global --add safe.directory /go/src/github.com/chef/automate
+  git config --global --add safe.directory '*'
   clean_all_compiled_protos || return $?
   bootstrap_proto_compilers || return $?
   compile_all_protobuf_components || return $?
diff --git a/scripts/repo_health.sh b/scripts/repo_health.sh
index a1f83d86e71..588956377ed 100755
--- a/scripts/repo_health.sh
+++ b/scripts/repo_health.sh
@@ -11,7 +11,7 @@ desired_golang_version() {
 export GOPROXY="https://proxy.golang.org,direct" 
 export GOSUMDB="sum.golang.org"
 
-hab pkg install -b core/git core/ruby core/jq-static core/shellcheck core/cacerts
+hab pkg install -b core/git ore/ruby/3.0.6/20240108025751 core/jq-static core/shellcheck core/cacerts
 hab pkg install -b "core/go1_22/1.22.5"
 
 echo "Checking Go Dependencies And Vendored Protos"