Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
babolivier committed Sep 5, 2019
1 parent d1d4643 commit 6cf60da
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/merge_base_branch.sh
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scripts-dev/check-newsfragment
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -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]
Expand Down

0 comments on commit 6cf60da

Please sign in to comment.