summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-23 17:37:50 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-10-23 17:37:50 +0100
commit7467a8090c51ac862d60cb70c79f11be7137492c (patch)
treec503958e957e1771ab3008f89c5b405a5b959336
parentMove sytest jobs to the right location (diff)
downloadsynapse-7467a8090c51ac862d60cb70c79f11be7137492c.tar.xz
Remove CircleCI configuration
-rw-r--r--.circleci/config.yml76
-rwxr-xr-x.circleci/merge_base_branch.sh35
2 files changed, 0 insertions, 111 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644

index ad6d839f35..0000000000 --- a/.circleci/config.yml +++ /dev/null
@@ -1,76 +0,0 @@ -version: 2 -jobs: - sytestpy2postgresmerged: - docker: - - image: matrixdotorg/sytest-synapse:dinsic - working_directory: /src - steps: - - checkout - - run: bash .circleci/merge_base_branch.sh - - run: POSTGRES=1 /synapse_sytest.sh - - store_artifacts: - path: /logs - destination: logs - - store_test_results: - path: /logs - sytestpy2postgresworkersmerged: - docker: - - image: matrixdotorg/sytest-synapse:dinsic - working_directory: /src - steps: - - checkout - - run: bash .circleci/merge_base_branch.sh - - run: POSTGRES=1 WORKERS=1 /synapse_sytest.sh - - store_artifacts: - path: /logs - destination: logs - - store_test_results: - path: /logs - sytestpy3postgresmerged: - docker: - - image: matrixdotorg/sytest-synapse:dinsic-py3 - working_directory: /src - steps: - - checkout - - run: bash .circleci/merge_base_branch.sh - - run: POSTGRES=1 /synapse_sytest.sh - - store_artifacts: - path: /logs - destination: logs - - store_test_results: - path: /logs - sytestpy3postgresworkersmerged: - docker: - - image: matrixdotorg/sytest-synapse:dinsic-py3 - working_directory: /src - steps: - - checkout - - run: bash .circleci/merge_base_branch.sh - - run: POSTGRES=1 WORKERS=1 /synapse_sytest.sh - - store_artifacts: - path: /logs - destination: logs - - store_test_results: - path: /logs - - -workflows: - version: 2 - build: - jobs: - - sytestpy2postgresmerged: - filters: - branches: - ignore: /develop|master|release-.*/ - - sytestpy2postgresworkersmerged: - filters: - branches: - ignore: /develop|master|release-.*/ - - sytestpy3postgresmerged: - filters: - branches: - ignore: /develop|master|release-.*/ - - sytestpy3postgresworkersmerged: - filters: - branches: - ignore: /develop|master|release-.*/ \ No newline at end of file diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh deleted file mode 100755
index 3a6476a96c..0000000000 --- a/.circleci/merge_base_branch.sh +++ /dev/null
@@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# CircleCI doesn't give CIRCLE_PR_NUMBER in the environment for non-forked PRs. Wonderful. -# In this case, we just need to do some ~shell magic~ to strip it out of the PULL_REQUEST URL. -echo 'export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"' >> $BASH_ENV -source $BASH_ENV - -if [[ -z "${CIRCLE_PR_NUMBER}" ]] -then - echo "Can't figure out what the PR number is! Assuming merge target is dinsic." - - # It probably hasn't had a PR opened yet. Since all PRs for dinsic land on - # dinsic, we can probably assume it's based on it and will be merged into - # it. - GITBASE="dinsic" -else - # Get the reference, using the GitHub API - GITBASE=`wget -O- https://api.github.com/repos/matrix-org/synapse-dinsic/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'` -fi - -# Show what we are before -git --no-pager show -s - -# Set up username so it can do a merge -git config --global user.email bot@matrix.org -git config --global user.name "A robot" - -# Fetch and merge. If it doesn't work, it will raise due to set -e. -git fetch -u origin $GITBASE -git merge --no-edit origin/$GITBASE - -# Show what we are after. -git --no-pager show -s