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
parent
905062f653
commit
fd9c74c806
File diff suppressed because it is too large
Load Diff
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue