Skip to content

Commit

Permalink
Change order when phpunit gets run as it has a dependency on a gulp run.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rudi Olckers committed Dec 7, 2016
1 parent 164e98f commit 5bd168a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ I welcome any feedback and contributions.
```bash
# update .env with APP_ENV=local and APP_DEBUG=false
$ composer install
$ vendor/bin/phpunit
$ npm install
$ gulp && gulp watch
$ gulp
$ vendor/bin/phpunit
$ gulp watch
```

#### Local docker LAMP stack
Expand All @@ -87,10 +88,10 @@ $ gulp && gulp watch
docker-compose build
docker-compose up
docker-compose run --rm composer install
docker-compose run --rm phpunit
docker-compose run --rm npm install
docker-compose run --rm gulp --production
docker-compose run --rm artisan key:generate
docker-compose run --rm phpunit
docker-compose run --rm artisan migrate:refresh --seed
docker-compose run --rm artisan db:seed --class=DummyBookmarksSeeder
```
Expand Down
2 changes: 2 additions & 0 deletions docker/create-rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ fi

docker-compose run --rm gulp --production

docker-compose run --rm phpunit

find ./storage -type 'f' | grep -v ".gitignore" | xargs rm -f

TIMESTAMP=$(date +%s)
Expand Down
2 changes: 1 addition & 1 deletion docker/prep-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ docker-compose stop
docker-compose rm -f
docker-compose build
docker-compose run --rm composer install
docker-compose run --rm phpunit
docker-compose run --rm npm install
docker-compose run --rm gulp --production
docker-compose run --rm artisan key:generate
docker-compose run --rm phpunit
docker-compose up -d
sleep 10s
docker-compose run --rm artisan migrate:refresh --seed
Expand Down

0 comments on commit 5bd168a

Please sign in to comment.