post comments fixes

scality · Mar 8, 2024 · 35260f9 · 35260f9
1 parent 43fde9f
commit 35260f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
+