Skip to content

Commit

Permalink
fix: define lowest deps correctly (#6941)
Browse files Browse the repository at this point in the history
  • Loading branch information
bshaffer authored Jan 5, 2024
1 parent 4beb3c4 commit bcda6b2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/run-package-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ for DIR in ${DIRS}; do {
done

echo "Installing composer in $DIR"
COMPOSER_ROOT_VERSION=$(cat $DIR/VERSION) composer -q --no-interaction --no-ansi --no-progress update -d ${DIR};
composer -q --no-interaction --no-ansi --no-progress update -d ${DIR};
if [ $? != 0 ]; then
echo "$DIR: composer install failed" >> "${FAILED_FILE}"
# run again but without "-q" so we can see the error
COMPOSER_ROOT_VERSION=$(cat $DIR/VERSION) composer --no-interaction --no-ansi --no-progress update -d ${DIR};
composer --no-interaction --no-ansi --no-progress update -d ${DIR};
continue
fi
echo "Running $DIR Unit Tests"
Expand Down
3 changes: 2 additions & 1 deletion AlloyDb/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
},
"require": {
"php": ">=7.4",
"google/gax": "^1.26.0"
"google/gax": "^1.26.0",
"google/common-protos": "^4.4"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
Expand Down
3 changes: 2 additions & 1 deletion Channel/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
},
"require": {
"php": ">=7.4",
"google/gax": "^1.26.0"
"google/gax": "^1.26.0",
"google/common-protos": "^3.2||^4.0"
},
"require-dev": {
"phpunit/phpunit": "^9.0"
Expand Down
4 changes: 2 additions & 2 deletions Core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"google/auth": "^1.34.0",
"guzzlehttp/guzzle": "^6.5.8|^7.4.4",
"guzzlehttp/promises": "^1.4||^2.0",
"guzzlehttp/psr7": "^1.7|^2.0",
"monolog/monolog": "^1.1|^2.0|^3.0",
"guzzlehttp/psr7": "^2.6",
"monolog/monolog": "^2.9|^3.0",
"psr/http-message": "^1.0|^2.0"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions LongRunning/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"description": "Google LongRunning Client for PHP",
"license": "Apache-2.0",
"minimum-stability": "stable",
"version": "0.2.6",
"autoload": {
"psr-4": {
"Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning",
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
"php": ">=7.4",
"rize/uri-template": "~0.3",
"guzzlehttp/guzzle": "^6.5.8|^7.4.4",
"guzzlehttp/psr7": "^1.7|^2.0",
"monolog/monolog": "^2.0||^3.0",
"guzzlehttp/psr7": "^2.6",
"monolog/monolog": "^2.9||^3.0",
"psr/http-message": "^1.0|^2.0",
"ramsey/uuid": "^4.0",
"google/gax": "^1.26.0",
"google/common-protos": "^4.0",
"google/common-protos": "^4.4",
"google/auth": "^1.34.0"
},
"require-dev": {
Expand Down

0 comments on commit bcda6b2

Please sign in to comment.