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

This commit is contained in:
Weblate 2018-11-21 19:14:09 +00:00
commit 819e6d9219
1 changed files with 4 additions and 2 deletions

View File

@ -8,14 +8,16 @@ nvm use 10
set -x set -x
npm install
# check out corresponding branches of dependencies. # check out corresponding branches of dependencies.
# #
# clone the deps with depth 1: we know we will only ever need that one # clone the deps with depth 1: we know we will only ever need that one
# commit. # commit.
# We need to do this after npm install otherwise modern node versions
# just reset it back.
`dirname $0`/fetch-develop.deps.sh --depth 1 `dirname $0`/fetch-develop.deps.sh --depth 1
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 olm npm install olm