From 72846a40f2c4080210f68becd99fe58d9109db48 Mon Sep 17 00:00:00 2001
From: gindibay <gindibay@microsoft.com>
Date: Wed, 12 Jul 2023 22:27:37 +0300
Subject: [PATCH] Rollbacks tools branch

---
 .github/packaging/validate_build_output.sh     |  2 +-
 .github/workflows/packaging-test-pipelines.yml | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh
index c7b02234e..2694688cf 100755
--- a/.github/packaging/validate_build_output.sh
+++ b/.github/packaging/validate_build_output.sh
@@ -25,7 +25,7 @@ pyenv versions
 pyenv virtualenv ${PACKAGING_PYTHON_VERSION} packaging_env
 pyenv activate packaging_env
 
-git clone -b error_add --depth=1  https://github.com/citusdata/tools.git tools
+git clone -b 0.8.24 --depth=1  https://github.com/citusdata/tools.git tools
 python3 -m pip install -r tools/packaging_automation/requirements.txt
 
 echo "Package type: ${package_type}"
diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml
index 16a9d2f2b..c6938e09a 100644
--- a/.github/workflows/packaging-test-pipelines.yml
+++ b/.github/workflows/packaging-test-pipelines.yml
@@ -162,6 +162,16 @@ jobs:
           git config --global --add safe.directory /__w/citus/citus
           make -sj$(cat /proc/cpuinfo | grep "core id" | wc -l) 2>&1 | tee -a output.log
 
+          # Check the exit code of the make command
+          make_exit_code=${PIPESTATUS[0]}
+
+          # If the make command returned a non-zero exit code, exit with the same code
+          if [[ $make_exit_code -ne 0 ]]; then
+              echo "make command failed with exit code $make_exit_code"
+              exit $make_exit_code
+          fi
+
+
       - name: Make install
         run: |
           set -e