Skip to content

Commit

Permalink
Merge pull request #595 from ergebnis/fix/no-suggest
Browse files Browse the repository at this point in the history
Fix: Remove deprecated --no-suggest option
  • Loading branch information
localheinz authored Oct 31, 2020
2 parents aefdf15 + 0ceed91 commit dbfb3cf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/actions/composer/composer/install/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
dependencies="${COMPOSER_INSTALL_DEPENDENCIES}"

if [[ ${dependencies} == "lowest" ]]; then
composer update --no-interaction --no-progress --no-suggest --prefer-lowest
composer update --no-interaction --no-progress --prefer-lowest

exit $?
fi

if [[ ${dependencies} == "locked" ]]; then
composer install --no-interaction --no-progress --no-suggest
composer install --no-interaction --no-progress

exit $?
fi

if [[ ${dependencies} == "highest" ]]; then
composer update --no-interaction --no-progress --no-suggest
composer update --no-interaction --no-progress

exit $?
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ jobs:
run: "composer remove composer/composer --no-interaction --no-progress"

- name: "Require composer/composer"
run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress --no-suggest"
run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress"

- name: "Remove git placeholder configuration with jq"
run: "echo $(cat box.json | jq 'del(.git)') > box.json"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: "composer remove composer/composer --no-interaction --no-progress"

- name: "Require composer/composer"
run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress --no-suggest"
run: "composer require composer/composer:${{ env.COMPOSER_VERSION }} --no-interaction --no-progress"

- name: "Validate configuration for humbug/box"
run: "phar/box.phar validate box.json"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ help: ## Displays this list of targets with descriptions
.PHONY: phar
phar: vendor ## Builds a phar with humbug/box
phar/box.phar validate box.json
composer require composer/composer:${COMPOSER_VERSION} --no-interaction --no-progress --no-suggest --update-with-dependencies
composer require composer/composer:${COMPOSER_VERSION} --no-interaction --no-progress --update-with-dependencies
phar/box.phar compile --config=box.json
git checkout HEAD -- composer.json composer.lock
phar/box.phar info .build/phar/composer-normalize.phar
Expand Down Expand Up @@ -61,4 +61,4 @@ tests: vendor ## Runs auto-review, unit, and integration tests with phpunit/phpu

vendor: composer.json composer.lock
composer validate --strict
composer install --no-interaction --no-progress --no-suggest
composer install --no-interaction --no-progress

0 comments on commit dbfb3cf

Please sign in to comment.