-
-
Notifications
You must be signed in to change notification settings - Fork 159
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from bolt/master
merge in order to continue development
- Loading branch information
Showing
222 changed files
with
18,409 additions
and
4,844 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,5 @@ root = true | |
| ; Unix-style newlines | ||
| [*] | ||
| end_of_line = LF | ||
|
|
||
| [*.php] | ||
| indent_style = space | ||
| indent_size = 4 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /.editorconfig export-ignore | ||
| /.env export-ignore | ||
| /.git export-ignore | ||
| /.gitattributes export-ignore | ||
| /.github export-ignore | ||
| /.gitignore export-ignore | ||
| /.phpspec.yml export-ignore | ||
| /.travis.yml export-ignore | ||
| /behat.yml export-ignore | ||
| /docker-compose.yml export-ignore | ||
| /ecs.php export-ignore | ||
| /Makefile export-ignore | ||
| /phpstan.neon export-ignore | ||
| /phpunit.bootstrap.php export-ignore | ||
| /phpunit.xml.dist export-ignore | ||
| /run_behat_tests.sh export-ignore | ||
| /symfony.lock export-ignore | ||
| /bin export-ignore | ||
| /config export-ignore | ||
| /docker export-ignore | ||
| /public export-ignore | ||
| /tests export-ignore | ||
| /var export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: Assets Code Analysis | ||
|
|
||
| on: | ||
| pull_request: null | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| asses_code_analysis: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| actions: | ||
| - | ||
| name: Lint Javascript files | ||
| run: npm run lint | ||
|
|
||
| - | ||
| name: Lint on SCSS files | ||
| run: npm run stylelint | ||
|
|
||
| name: ${{ matrix.actions.name }} | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| # see https://github.com/actions/starter-workflows/blob/main/ci/node.js.yml | ||
| - | ||
| name: Use Node.js 12.5 | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 12.5 | ||
|
|
||
| # same as "npm install", just uses package-lock.json", see https://stackoverflow.com/a/53325242/1348344 | ||
| - run: npm ci | ||
|
|
||
| - run: ${{ matrix.actions.run }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,55 @@ | ||
| language: php | ||
| os: linux | ||
| dist: xenial | ||
| sudo: false | ||
| php: | ||
| - 7.2 | ||
| - 7.3 | ||
| - 7.4 | ||
|
|
||
| env: | ||
| - APP_ENV_CURRENT=prod APP_DEBUG_CURRENT=0 | ||
| - APP_ENV_CURRENT=dev APP_DEBUG_CURRENT=1 | ||
| - 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 | ||
| jobs: | ||
| fast_finish: true | ||
|
|
||
| before_install: | ||
| - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available" | ||
| - export $(grep -v '^#' .env.dist | xargs -d '\n') # export all environment variables (overrides APP_ENV, APP_DEBUG) | ||
| - export APP_ENV="$APP_ENV_CURRENT" APP_DEBUG="$APP_DEBUG_CURRRENT" # put back original environment variables | ||
| - composer self-update -q | ||
| - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available" | ||
| - composer self-update --2 -q | ||
|
|
||
| install: | ||
| - COMPOSER_MEMORY_LIMIT=-1 composer update $COMPOSER_FLAGS | ||
| - ./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 EsLint on Javascript files | ||
| - npm run lint | ||
|
|
||
| # run StyleLint on SCSS | ||
| - npm run stylelint | ||
|
|
||
| # 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 behat-in-ci | ||
|
|
||
| # Upload Behat logs | ||
| - ./vendor/bin/upload-textfiles "var/log/behat-reports/*.log" | ||
| # Upload Behat logs | ||
| - ./vendor/bin/upload-textfiles "var/log/behat-reports/*.log" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.