Skip to content

Commit

Permalink
Disable check-merge-to-enterprise
Browse files Browse the repository at this point in the history
This will be reverted before opening main pr against community/master
  • Loading branch information
onurctirtir committed Sep 7, 2020
1 parent c8b91e8 commit 9612169
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
17 changes: 0 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -485,16 +485,6 @@ 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
Expand Down Expand Up @@ -530,13 +520,6 @@ 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
Expand Down
3 changes: 3 additions & 0 deletions ci/check_all_ci_scripts_are_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ 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
Expand Down

0 comments on commit 9612169

Please sign in to comment.