Skip to content

Commit

Permalink
chore(tests): remove intermediate layer when running via Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
malept committed Dec 17, 2017
1 parent fcef382 commit 6282a11
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
7 changes: 0 additions & 7 deletions ci/Dockerfile

This file was deleted.

5 changes: 4 additions & 1 deletion ci/docker.sh
Expand Up @@ -3,4 +3,7 @@
NODE_INSTALLER="$1"

if [[ "$NODE_INSTALLER" = "yarn" ]]; then npm i -g yarn; fi
npm run test -- --installer=$NODE_INSTALLER

cd /code

CI=true npm run test -- --installer=$NODE_INSTALLER
3 changes: 1 addition & 2 deletions ci/script.sh
@@ -1,8 +1,7 @@
#!/bin/bash

if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
sudo docker build -f ci/Dockerfile . -t electron-forge-ci
sudo docker run -it electron-forge-ci ci/docker.sh $NODE_INSTALLER
sudo docker run --interactive --tty --volume $(pwd):/code malept/electron-forge-container:latest /code/ci/docker.sh $NODE_INSTALLER
else
npm run test-coverage -- --installer=$NODE_INSTALLER
fi

0 comments on commit 6282a11

Please sign in to comment.