From 2a857765e567389058e282b0e25026c93e44d79f Mon Sep 17 00:00:00 2001
From: Abhijeet Patil <abhijeet@neon.tech>
Date: Wed, 17 Jan 2024 14:43:24 +0000
Subject: [PATCH] fixing build

---
 .github/workflows/build_and_test.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 9e2e5e9f33..2a1697d251 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -195,6 +195,7 @@ jobs:
       BUILD_TYPE: ${{ matrix.build_type }}
       GIT_VERSION: ${{ github.event.pull_request.head.sha || github.sha }}
       BUILD_TAG: ${{ needs.tag.outputs.build-tag }}
+      CC: clang
 
     steps:
       - name: Fix git ownership
@@ -266,7 +267,6 @@ jobs:
           CARGO_FEATURES="--features testing"
           if [[ $BUILD_TYPE == "debug" ]]; then
             cov_prefix="scripts/coverage --profraw-prefix=$GITHUB_JOB --dir=/tmp/coverage run"
-            make_prefix="CC=clang CARGO_BUILD_FLAGS=\"--features testing\""
             CARGO_FLAGS="--locked"
             ASAN_OPTIONS="detect_leaks=0:abort_on_error=1:print_stacktrace=1:disable_coredump=0:\
           strict_string_checks=1:check_initialization_order=1:strict_init_order=1:detect_stack_use_after_return=0"
@@ -274,7 +274,6 @@ jobs:
             RUSTFLAGS="-C linker=clang"
           elif [[ $BUILD_TYPE == "release" ]]; then
             cov_prefix=""
-            make_prefix=""
             ASAN_OPTIONS=""
             UBSAN_OPTIONS=""
             RUSTFLAGS=""
@@ -333,21 +332,21 @@ jobs:
 
       - name: Build postgres v14
         if: steps.cache_pg_14.outputs.cache-hit != 'true'
-        run: ${make_prefix} mold -run make postgres-v14 -j$(nproc)
+        run: mold -run make postgres-v14 -j$(nproc)
 
       - name: Build postgres v15
         if: steps.cache_pg_15.outputs.cache-hit != 'true'
-        run: ${make_prefix} mold -run make postgres-v15 -j$(nproc)
+        run: mold -run make postgres-v15 -j$(nproc)
 
       - name: Build postgres v16
         if: steps.cache_pg_16.outputs.cache-hit != 'true'
-        run: ${make_prefix} mold -run make postgres-v16 -j$(nproc)
+        run: mold -run make postgres-v16 -j$(nproc)
 
       - name: Build neon extensions
-        run: ${make_prefix} mold -run make neon-pg-ext -j$(nproc)
+        run: mold -run make neon-pg-ext -j$(nproc)
 
       - name: Build walproposer-lib
-        run: ${make_prefix} mold -run make walproposer-lib -j$(nproc)
+        run: mold -run make walproposer-lib -j$(nproc)
 
       - name: Run cargo build
         run: |