mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge pull request #4754 from vector-im/rav/fix_crypto_build
Fix crypto on develop
This commit is contained in:
commit
10ee9f4de4
@ -31,8 +31,8 @@
|
|||||||
"build:res": "node scripts/copy-res.js",
|
"build:res": "node scripts/copy-res.js",
|
||||||
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
|
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
|
||||||
"build:compile": "npm run reskindex && babel --source-maps -d lib src",
|
"build:compile": "npm run reskindex && babel --source-maps -d lib src",
|
||||||
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress",
|
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail",
|
||||||
"build:bundle:dev": "webpack --optimize-occurence-order --progress",
|
"build:bundle:dev": "webpack --optimize-occurence-order --progress --bail",
|
||||||
"build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
|
"build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
|
||||||
"build": "npm run reskindex && npm run build:res && npm run build:bundle",
|
"build": "npm run reskindex && npm run build:res && npm run build:bundle",
|
||||||
"build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
|
"build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
|
||||||
|
@ -49,42 +49,47 @@ function dodep() {
|
|||||||
[ "$curbranch" != 'develop' ] && clone $org $repo develop
|
[ "$curbranch" != 'develop' ] && clone $org $repo develop
|
||||||
} || return $?
|
} || return $?
|
||||||
|
|
||||||
(
|
echo "$repo set to branch "`git -C "$repo" rev-parse --abbrev-ref HEAD`
|
||||||
cd $repo
|
|
||||||
echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD`
|
|
||||||
)
|
|
||||||
|
|
||||||
mkdir -p node_modules
|
mkdir -p node_modules
|
||||||
rm -r "node_modules/$repo" 2>/dev/null || true
|
rm -r "node_modules/$repo" 2>/dev/null || true
|
||||||
ln -sv "../$repo" node_modules/
|
ln -sv "../$repo" node_modules/
|
||||||
|
|
||||||
|
(
|
||||||
|
cd $repo
|
||||||
|
npm install
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
##############################
|
||||||
|
|
||||||
echo -en 'travis_fold:start:matrix-js-sdk\r'
|
echo -en 'travis_fold:start:matrix-js-sdk\r'
|
||||||
echo 'Setting up matrix-js-sdk'
|
echo 'Setting up matrix-js-sdk'
|
||||||
|
|
||||||
dodep matrix-org matrix-js-sdk
|
dodep matrix-org matrix-js-sdk
|
||||||
(
|
|
||||||
cd node_modules/matrix-js-sdk
|
|
||||||
npm install
|
|
||||||
)
|
|
||||||
|
|
||||||
echo -en 'travis_fold:end:matrix-js-sdk\r'
|
echo -en 'travis_fold:end:matrix-js-sdk\r'
|
||||||
|
|
||||||
|
##############################
|
||||||
|
|
||||||
echo -en 'travis_fold:start:matrix-react-sdk\r'
|
echo -en 'travis_fold:start:matrix-react-sdk\r'
|
||||||
echo 'Setting up matrix-react-sdk'
|
echo 'Setting up matrix-react-sdk'
|
||||||
|
|
||||||
dodep matrix-org matrix-react-sdk
|
dodep matrix-org matrix-react-sdk
|
||||||
|
|
||||||
mkdir -p node_modules/matrix-react-sdk/node_modules
|
# replace the version of js-sdk that got pulled into react-sdk with a symlink
|
||||||
|
# to our version. Make sure to do this *after* doing 'npm i' in react-sdk,
|
||||||
|
# otherwise npm helpfully moves another-json from matrix-js-sdk/node_modules
|
||||||
|
# into matrix-react-sdk/node_modules.
|
||||||
|
#
|
||||||
|
# (note this matches the instructions in the README.)
|
||||||
|
rm -r node_modules/matrix-react-sdk/node_modules/matrix-js-sdk
|
||||||
ln -s ../../matrix-js-sdk node_modules/matrix-react-sdk/node_modules/
|
ln -s ../../matrix-js-sdk node_modules/matrix-react-sdk/node_modules/
|
||||||
|
|
||||||
(
|
|
||||||
cd node_modules/matrix-react-sdk
|
|
||||||
npm install
|
|
||||||
)
|
|
||||||
|
|
||||||
echo -en 'travis_fold:end:matrix-react-sdk\r'
|
echo -en 'travis_fold:end:matrix-react-sdk\r'
|
||||||
|
|
||||||
|
##############################
|
||||||
|
|
||||||
# Link the reskindex binary in place: if we used npm link,
|
# Link the reskindex binary in place: if we used npm link,
|
||||||
# npm would do this for us, but we don't because we'd have
|
# npm would do this for us, but we don't because we'd have
|
||||||
# to define the npm prefix somewhere so it could put the
|
# to define the npm prefix somewhere so it could put the
|
||||||
|
@ -8,8 +8,11 @@ nvm use 6
|
|||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
# check out corresponding branches of dependencies
|
# check out corresponding branches of dependencies.
|
||||||
`dirname $0`/fetch-develop.deps.sh
|
#
|
||||||
|
# clone the deps with depth 1: we know we will only ever need that one
|
||||||
|
# commit.
|
||||||
|
`dirname $0`/fetch-develop.deps.sh --depth 1
|
||||||
|
|
||||||
npm install
|
npm install
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user