gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use fetch dep script in jenkins script

This commit is contained in:
David Baker 2017-05-17 16:17:08 +01:00
parent fac8906102
commit 94ac4bf490
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/fetch-develop.deps.sh
View File

@ -17,6 +17,7 @@ function dodep() {
git clone https://github.com/$org/$repo.git $repo git clone https://github.com/$org/$repo.git $repo
pushd $repo pushd $repo
git checkout $curbranch || git checkout develop git checkout $curbranch || git checkout develop
npm install
echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD` echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD`
popd popd
} }

10
scripts/jenkins.sh
View File

@ -8,10 +8,13 @@ nvm use 6
set -x set -x
# check out corresponding branches of dependencies
`dirname $0`/fetch-develop.deps.sh
npm install npm install
# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked. # apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
npm install matrix-react-sdk matrix-js-sdk olm npm install olm
# install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url # install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
# from our package.json (or even matrix-js-sdk's) in preference. # from our package.json (or even matrix-js-sdk's) in preference.
@ -23,11 +26,6 @@ npm install matrix-react-sdk matrix-js-sdk olm
#rm -r node_modules/olm #rm -r node_modules/olm
#cp -r olm/package node_modules/olm #cp -r olm/package node_modules/olm
# we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
(cd node_modules/matrix-js-sdk && npm install)
(cd node_modules/matrix-react-sdk && npm install)
# run the mocha tests # run the mocha tests
npm run test npm run test