Revert "Disable check-merge-to-enterprise"

This reverts commit 9612169.
citusdata · Sep 8, 2020 · 5012c6b · 5012c6b
1 parent 07cbaac
commit 5012c6b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -485,6 +485,16 @@ jobs:
           name: 'Install and Test (check-failure)'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-failure'
           no_output_timeout: 2m
+
+  check-merge-to-enterprise:
+    docker:
+      - image: citus/extbuilder:13beta3
+    working_directory: /home/circleci/project
+    steps:
+      - checkout
+      - run:
+          command: |
+            ci/check_enterprise_merge.sh
   ch_benchmark:
     docker:
       - image: buildpack-deps:stretch
@@ -520,6 +530,13 @@ workflows:
   build_and_test:
     jobs:
 
+      - check-merge-to-enterprise:
+          filters:
+            branches:
+              ignore:
+                - /release-[0-9]+\.[0-9]+.*/ # match with releaseX.Y.*
+
+
       - build-11
       - build-12
       - build-13

diff --git a/ci/check_all_ci_scripts_are_run.sh b/ci/check_all_ci_scripts_are_run.sh
@@ -15,9 +15,6 @@ ci_scripts=$(
 )
 for script in $ci_scripts; do
     if ! grep "\\bci/$script\\b" .circleci/config.yml > /dev/null; then
-        if [ "$script" = "check_enterprise_merge.sh" ]; then
-          continue;
-        fi
         echo "ERROR: CI script with name \"$script\" is not actually used in .circleci/config.yml"
         exit 1
     fi