mirror of
https://github.com/balena-io/etcher.git
synced 2025-07-23 19:26:33 +00:00
Merge branch 'salvozappa-fix-travis-build'
This commit is contained in:
commit
a338c6e60a
@ -48,9 +48,9 @@ if [ "$ARGV_OPERATING_SYSTEM" == "linux" ]; then
|
|||||||
./scripts/build/docker/run-command.sh \
|
./scripts/build/docker/run-command.sh \
|
||||||
-r "$ARGV_ARCHITECTURE" \
|
-r "$ARGV_ARCHITECTURE" \
|
||||||
-s "$(pwd)" \
|
-s "$(pwd)" \
|
||||||
-c 'xvfb-run --server-args=$XVFB_ARGS make lint test sanity-checks'
|
-c 'xvfb-run --server-args=$XVFB_ARGS make webpack lint test sanity-checks'
|
||||||
else
|
else
|
||||||
./scripts/build/check-dependency.sh make
|
./scripts/build/check-dependency.sh make
|
||||||
export TARGET_ARCH="$ARGV_ARCHITECTURE"
|
export TARGET_ARCH="$ARGV_ARCHITECTURE"
|
||||||
make lint test sanity-checks
|
make webpack lint test sanity-checks
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user