summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-05 16:38:20 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-05 16:40:55 +0100
commit6cf60da6e96f3dfbd58435b0390da91db04901c0 (patch)
tree3d0df16118c780fac50b392f70b340d1d9de66e0
parentLint (diff)
downloadsynapse-6cf60da6e96f3dfbd58435b0390da91db04901c0.tar.xz
Fix CI
-rwxr-xr-x.circleci/merge_base_branch.sh2
-rwxr-xr-xscripts-dev/check-newsfragment6
-rw-r--r--tox.ini2
3 files changed, 5 insertions, 5 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh

index 56895284ba..3a6476a96c 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh
@@ -17,7 +17,7 @@ then GITBASE="dinsic" else # Get the reference, using the GitHub API - GITBASE=`wget -O- https://api.github.com/repos/matrix-org/synapse/pulls/${CIRCLE_PR_NUMBER} | jq -r '.base.ref'` + 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 diff --git a/scripts-dev/check-newsfragment b/scripts-dev/check-newsfragment
index 0ec5075e79..b8a85abe18 100755 --- a/scripts-dev/check-newsfragment +++ b/scripts-dev/check-newsfragment
@@ -5,9 +5,9 @@ set -e -# make sure that origin/develop is up to date -git remote set-branches --add origin develop -git fetch origin develop +# make sure that origin/dinsic is up to date +git remote set-branches --add origin dinsic +git fetch origin dinsic # if there are changes in the debian directory, check that the debian changelog # has been updated diff --git a/tox.ini b/tox.ini
index 543b232ae7..b702cf670b 100644 --- a/tox.ini +++ b/tox.ini
@@ -128,7 +128,7 @@ commands = /bin/sh -c "isort -c -df -sp setup.cfg -rc synapse tests" skip_install = True deps = towncrier>=18.6.0rc1 commands = - python -m towncrier.check --compare-with=origin/develop + python -m towncrier.check --compare-with=origin/dinsic basepython = python3.6 [testenv:check-sampleconfig]