Skip to content

Commit

Permalink
minor Sylius#13914 Revert "[docker]Run Catalog Promotion via SYNC mes…
Browse files Browse the repository at this point in the history
…senger transport" (lchrusciel)

This PR was merged into the 1.12-dev branch.

Discussion
----------

Reverts Sylius#13897, due to too quick merge. The build itself was red and it should not land in the codebase in the first place

Commits
-------

3f0750b Revert "[docker]Run Catalog Promotion via SYNC messenger transport"
  • Loading branch information
lchrusciel authored Apr 29, 2022
2 parents e34578a + 3f0750b commit 4b907c6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .docker/test/php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ date.timezone=${PHP_DATE_TIMEZONE}
[opcache]
opcache.enable=1
opcache.enable_cli=0
opcache.memory_consumption=512
opcache.memory_consumption=256
opcache.max_accelerated_files=32531
opcache.interned_strings_buffer=8
opcache.validate_timestamps=0
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
docker-compose:
name: Execute Tests on Docker Compose
name: Excute Tests on Docker Compose
runs-on: ubuntu-latest
env:
COMPOSE_FILE: docker-compose.test.yml
Expand All @@ -18,7 +18,7 @@ jobs:
run: docker-compose run ci

docker:
name: Execute Tests on Docker Containers
name: Excute Tests on Docker Containers
runs-on: ubuntu-latest
steps:
-
Expand Down Expand Up @@ -48,7 +48,6 @@ jobs:
-e DATABASE_URL="mysql://root@mysql/sylius_test" \
-e APP_ENV="test" \
-e PHP_DATE_TIMEZONE="Europe/Warsaw" \
-e MESSENGER_TRANSPORT_DSN="sync://" \
--net sylius_network \
--entrypoint="" \
-p 80:80/tcp \
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ init:

ci:
composer install --no-interaction --no-scripts
composer dump-env ${APP_ENV}
bin/console sylius:install --no-interaction
bin/console sylius:fixtures:load default --no-interaction
bin/console cache:warmup
yarn install --pure-lockfile
yarn build
vendor/bin/phpunit
vendor/bin/phpspec run --ansi --no-interaction -f dot
vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript&&@cli&&~@todo" || vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript&&@cli&&~@todo" --rerun # CLI Behat
vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@cli&&~@todo" || vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@cli&&~@todo" --rerun # NON JS Behat
#vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="@javascript&&~@cli&&~@todo" # JS Behat
vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&@cli&&~@todo" # CLI Behat
vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@cli&&~@todo" # NON JS Behat
#vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@cli&&~@todo" # JS Behat

unit:
vendor/bin/phpunit
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ services:
image: sylius/standard:1.11-traditional
entrypoint: ["make", "ci"]
environment:
APP_ENV: "test_cached"
APP_ENV: "test"
DATABASE_URL: "mysql://root:mysql@mysql/sylius_test"
PHP_DATE_TIMEZONE: "Europe/Warsaw"
MESSENGER_TRANSPORT_DSN: "sync://"
KERNEL_CLASS: "App\Kernel"
volumes:
- ./:/app:delegated
- ./.docker/test/php.ini:/etc/php/8.0/fpm/php.ini:delegated
Expand Down

0 comments on commit 4b907c6

Please sign in to comment.