PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-05-02 15:30:41 +00:00
commit fe65065545
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
jenkins.sh
View file

@ -11,8 +11,9 @@ set -x
# install the other dependencies # install the other dependencies
npm install npm install
# we may be using a dev branch of js-sdk in which case we need to build it scripts/fetchdep.sh matrix-org matrix-js-sdk
(cd node_modules/matrix-js-sdk && npm install) ln -s ../matrix-js-sdk node_modules/matrix-js-sdk
(cd matrix-js-sdk && npm install)
# run the mocha tests # run the mocha tests
npm run test -- --no-colors npm run test -- --no-colors

12
scripts/fetchdep.sh
View file

@ -5,8 +5,16 @@ set -e
org="$1" org="$1"
repo="$2" repo="$2"
curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" curbranch="$TRAVIS_PULL_REQUEST_BRANCH"
[ -z "$curbranch" ] && curbranch="$TRAVIS_BRANCH"
[ -z "$curbranch" ] && curbranch="$GIT_BRANCH" # jenkins
if [ -n "$curbranch" ]
then
echo "Determined branch to be $curbranch" echo "Determined branch to be $curbranch"
git clone https://github.com/$org/$repo.git $repo --branch "$curbranch" || git clone https://github.com/$org/$repo.git $repo --branch develop git clone https://github.com/$org/$repo.git $repo --branch "$curbranch" && exit 0
fi
echo "Checking out develop branch"
git clone https://github.com/$org/$repo.git $repo --branch develop