Skip to content

Commit

Permalink
apply editorconfig spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasVotruba committed Oct 8, 2020
1 parent fa6c1dc commit 390a2c2
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 36 deletions.
2 changes: 0 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ root = true
; Unix-style newlines
[*]
end_of_line = LF

[*.php]
indent_style = space
indent_size = 4
68 changes: 34 additions & 34 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,54 @@ language: php
dist: xenial
sudo: false
php:
- 7.2
- 7.3
- 7.4
- 7.2
- 7.3
- 7.4

addons:
chrome: stable
chrome: stable

cache:
directories:
- $HOME/.composer/cache/files
directories:
- $HOME/.composer/cache/files

matrix:
fast_finish: true
fast_finish: true

before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- composer self-update -q
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- composer self-update -q

install:
- COMPOSER_MEMORY_LIMIT=-1 composer update
- ./bin/console bolt:info
- nvm install 12.5
- npm ci
- mkdir -p ./var/log/e2e-reports/report/features/
- touch ./var/log/e2e-reports/report/features/.gitkeep
- COMPOSER_MEMORY_LIMIT=-1 composer update
- ./bin/console bolt:info
- nvm install 12.5
- npm ci
- mkdir -p ./var/log/e2e-reports/report/features/
- touch ./var/log/e2e-reports/report/features/.gitkeep

before_script:
# build assets
- npm run build
# prepare web server for e2e tests
- ./bin/console doctrine:database:create
- ./bin/console doctrine:schema:create
- ./bin/console doctrine:fixtures:load --group=without-images -n
- ./bin/console server:start 127.0.0.1:8088
# test if web server works
- sleep 3
- wget "http://127.0.0.1:8088/bolt/login"
- export PATH=$PATH:$PWD/vendor/bin
# build assets
- npm run build
# prepare web server for e2e tests
- ./bin/console doctrine:database:create
- ./bin/console doctrine:schema:create
- ./bin/console doctrine:fixtures:load --group=without-images -n
- ./bin/console server:start 127.0.0.1:8088
# test if web server works
- sleep 3
- wget "http://127.0.0.1:8088/bolt/login"
- export PATH=$PATH:$PWD/vendor/bin

script:
# run PHP Unit
- ./vendor/bin/phpunit
# run PHP Unit
- ./vendor/bin/phpunit

# run API tests
- make behat-api-quiet
# run API tests
- make behat-api-quiet

# run JS e2e tests
- travis_retry make db-reset-without-images && make behat-js-quiet
# run JS e2e tests
- travis_retry make db-reset-without-images && make behat-js-quiet

# Upload Behat logs
- ./vendor/bin/upload-textfiles "var/log/behat-reports/*.log"
# Upload Behat logs
- ./vendor/bin/upload-textfiles "var/log/behat-reports/*.log"

0 comments on commit 390a2c2

Please sign in to comment.