Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.4.1 -- dependency updates #169

Merged
merged 4 commits into from
Aug 14, 2024
Merged

Release 5.4.1 -- dependency updates #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14b926f
Merge remote-tracking branch 'origin/main' into develop
briskt Jul 31, 2024
05913ec
remove hyphen from docker-compose
briskt Jul 31, 2024
204404e
remove version from docker-compose.yml and actions-services.yml
briskt Jul 31, 2024
fef4f45
dependency updates
briskt Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-and-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Check PSR2
run: docker-compose -f actions-services.yml run --rm app ./check-psr2.sh
run: docker compose -f actions-services.yml run --rm app ./check-psr2.sh
- name: Run unit tests
run: docker-compose -f actions-services.yml run --rm app ./run-tests.sh
run: docker compose -f actions-services.yml run --rm app ./run-tests.sh

build-and-publish:
name: Build and Publish
Expand Down
38 changes: 19 additions & 19 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
sync_full: broker deps
docker-compose run --rm app
docker compose run --rm app

sync_incremental: broker deps
docker-compose run --rm app bash -c "/data/yii batch/incremental"
docker compose run --rm app bash -c "/data/yii batch/incremental"

bash:
docker-compose run --rm cli bash
docker compose run --rm cli bash

behat:
docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure"
docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure"

behatlocal:
docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure --tags '~@integration'"
docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure --tags '~@integration'"

behatlocalappend:
docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --tags '~@integration' --append-snippets"
docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --tags '~@integration' --append-snippets"

behatv:
docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat -v --config=features/behat.yml --strict --stop-on-failure"
docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat -v --config=features/behat.yml --strict --stop-on-failure"

behatappend:
docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --append-snippets"
docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --append-snippets"

broker:
docker-compose up -d brokerdb brokercron broker
docker compose up -d brokerdb brokercron broker
make wait_for_broker

clean:
docker-compose kill
docker-compose rm -f
docker compose kill
docker compose rm -f

deps:
docker-compose run --rm cli composer install --no-scripts
docker compose run --rm cli composer install --no-scripts

composershow:
docker-compose run --rm cli bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'
docker compose run --rm cli bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'

depsupdate:
docker-compose run --rm cli bash -c "composer update --no-scripts"
docker compose run --rm cli bash -c "composer update --no-scripts"
make composershow

phpmyadmin:
docker-compose up -d phpmyadmin
docker compose up -d phpmyadmin

psr2:
docker-compose run --rm cli bash -c "vendor/bin/php-cs-fixer fix ."
docker compose run --rm cli bash -c "vendor/bin/php-cs-fixer fix ."

# NOTE: When running tests locally, make sure you don't exclude the integration
# tests (which we do when testing on Codeship).
test: deps unittest broker behat

testci: deps broker
docker-compose run --rm cli bash -c "./run-tests.sh"
docker compose run --rm cli bash -c "./run-tests.sh"

unittest:
docker-compose run --rm cli vendor/bin/phpunit
docker compose run --rm cli vendor/bin/phpunit

wait_for_broker:
docker-compose run --rm cli whenavail broker 80 20 echo "Broker is ready"
docker compose run --rm cli whenavail broker 80 20 echo "Broker is ready"
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ run `make testci` first, then use one of the following to run just a specific te

OR

- `docker-compose run --rm cli bash -c "vendor/bin/behat --config=features/behat.yml --suite=notification_features"`
- `docker compose run --rm cli bash -c "vendor/bin/behat --config=features/behat.yml --suite=notification_features"`

Substitute `notification_features` with any of the suites defined in `behat.yml`

Expand Down
2 changes: 0 additions & 2 deletions actions-services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
app:
build: .
Expand Down
Loading