Remove npm from native workspace loader build.

The workspace loader uses yarn since #10694, but this was not added to
the native build.

Uses npx to not have a dependency on an installed yarn version, specify
the same yarn version as the Dockerfile does.

Signed-off-by: Gerben Oolbekkink <g.j.w.oolbekkink@gmail.com>
7.20.x
Gerben Oolbekkink 2019-03-20 23:44:23 +01:00
parent 905062f653
commit fd9c74c806
No known key found for this signature in database
GPG Key ID: 114A01F22030904B
2 changed files with 6 additions and 12629 deletions

File diff suppressed because it is too large Load Diff

View File

@ -134,11 +134,13 @@
<configuration>
<target>
<!-- install node modules -->
<exec dir="${basedir}" executable="npm" failonerror="true">
<exec dir="${basedir}" executable="npx" failonerror="true">
<arg value="yarn@1.9.4" />
<arg value="install" />
</exec>
<!-- build workspace loader -->
<exec dir="${basedir}" executable="npm" failonerror="true">
<exec dir="${basedir}" executable="npx" failonerror="true">
<arg value="yarn@1.9.4" />
<arg value="run" />
<arg value="build" />
</exec>
@ -154,7 +156,8 @@
<configuration>
<target>
<!-- test workspace loader -->
<exec dir="${basedir}" executable="npm" failonerror="true">
<exec dir="${basedir}" executable="npx" failonerror="true">
<arg value="yarn@1.9.4" />
<arg value="run" />
<arg value="test" />
</exec>