fix ci

nextras · Dec 6, 2021 · 281a660 · 281a660
1 parent d3921f6
commit 281a660
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/tests/matrix/dbal/doctrine-2.0-php-5.4-to-7.3.sh b/tests/matrix/dbal/doctrine-2.0-php-5.4-to-7.3.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 PHP_VERSION_MIN="50400"
 PHP_VERSION_MAX="70399"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5.13"
 DBAL="doctrine"
diff --git a/tests/matrix/nette-di/nette-2.3-php-5.5-to-7.1.sh b/tests/matrix/nette-di/nette-2.3-php-5.5-to-7.1.sh
@@ -6,5 +6,6 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.3.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~3.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/cache:~1.6"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~2.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~3.0"
diff --git a/tests/matrix/nette-di/nette-2.4-php-7.1.sh b/tests/matrix/nette-di/nette-2.4-php-7.1.sh
@@ -6,5 +6,6 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.4.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/cache:~1.11"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
diff --git a/tests/matrix/nette-di/nette-2.4-php-7.2.sh b/tests/matrix/nette-di/nette-2.4-php-7.2.sh
@@ -6,5 +6,6 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~2.4.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/cache:~1.11"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
diff --git a/tests/matrix/nette-di/nette-3.0-php-7.1-to-7.2.sh b/tests/matrix/nette-di/nette-3.0-php-7.1-to-7.2.sh
@@ -6,5 +6,6 @@ COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/utils:~3.0.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE dibi/dibi:~4.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/cache:~1.11"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE nextras/dbal:~3.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
diff --git a/tests/matrix/symfony-bundle/symfony-4.0-php-7.3-to-7.4.sh b/tests/matrix/symfony-bundle/symfony-4.0-php-7.3-to-7.4.sh
@@ -3,7 +3,7 @@ PHP_VERSION_MIN="70300"
 PHP_VERSION_MAX="70499"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~2.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.6.3"
-COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle:<2.5"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~4.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~4.0"
 COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~4.0"

diff --git a/tests/run-integration.sh b/tests/run-integration.sh
@@ -79,12 +79,14 @@ composer_prepare_dependencies()
 			--no-interaction \
 			--no-update \
 			--dev \
+		  --with-all-dependencies \
 			$COMPOSER_REQUIRE
 	fi
 
 	composer update \
 		--no-interaction \
 		--no-progress \
+		--with-all-dependencies \
 		$COMPOSER_PREFER_LOWEST
 }