From 35260f996e3de9cd756eacc3851c6300c0e48653 Mon Sep 17 00:00:00 2001 From: Maha Benzekri Date: Fri, 8 Mar 2024 15:23:29 +0100 Subject: [PATCH] post comments fixes --- .github/workflows/pre-merge.yml | 2 ++ solution-base/mongodb/Makefile | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 43e33868b2..0e4de7e3b7 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -21,6 +21,8 @@ jobs: cache: 'yarn' - name: run fetch-mongodb-sharded run: make -C solution-base/mongodb fetch-mongodb-sharded + - name: run patch + run: make -C solution-base/mongodb patch - name: Check for changes run: | git diff --exit-code || { echo "Error: Changes detected after running 'make fetch-mongodb-sharded'. Please ensure step is completed."; exit 1; } diff --git a/solution-base/mongodb/Makefile b/solution-base/mongodb/Makefile index 16ec5e118f..bd38d5bbfe 100644 --- a/solution-base/mongodb/Makefile +++ b/solution-base/mongodb/Makefile @@ -25,7 +25,10 @@ fetch-mongodb-sharded: --version ${CHART_MONGO_SHARDED_VERSION} \ --untar \ --untardir ${CHART_DIR} - patch: - @git apply --check ${PATCH_FILES} - @git apply ${PATCH_FILES} + @for patch_file in ${PATCH_FILES}; do \ + echo "Applying patch: $$patch_file"; \ + git apply --check "$$patch_file" || exit 1; \ + git apply "$$patch_file"; \ + done +