Merge branch 'v2.x' into v2.6.0-tap_test_fixes

sysown · Jul 27, 2023 · 5cb7365 · 5cb7365
2 parents 83e15fb + 8e7aaef
commit 5cb7365
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci-taptests.yml b/.github/workflows/ci-taptests.yml
@@ -72,12 +72,12 @@ jobs:
     - name: Patch TAP-tests
       run: |
         # apply patches
-        #for PATCH in $(cd jenkins-build-scripts/test-scripts/patches; find . -type f); do
-        #  if [[ $PATCH =~ \.patch ]]; then
-        #    patch proxysql/${PATCH%.patch} jenkins-build-scripts/test-scripts/patches/${PATCH} || true
-        #  elif [[ ! -f jenkins-build-scripts/test-scripts/patches/${PATCH#./}.patch ]]; then
-        #    cp jenkins-build-scripts/test-scripts/patches/${PATCH#./} proxysql/${PATCH#./} || true
-        #  fi
+        for PATCH in $(cd jenkins-build-scripts/test-scripts/patches; find . -type f); do
+          if [[ $PATCH =~ \.patch ]]; then
+            patch proxysql/${PATCH%.patch} jenkins-build-scripts/test-scripts/patches/${PATCH} || true
+          elif [[ ! -f jenkins-build-scripts/test-scripts/patches/${PATCH#./}.patch ]]; then
+            cp jenkins-build-scripts/test-scripts/patches/${PATCH#./} proxysql/${PATCH#./} || true
+          fi
         #done
         # patch multi port listening
         cd proxysql/