Merge pull request GOCDB#515 from GOCDB/release-5.12.0

Release 5.12.0 to master
Sae126V · Apr 22, 2024 · 356ac65 · 356ac65
2 parents 4dbb091 + f63595f
commit 356ac65
Show file tree

Hide file tree

Showing 6 changed files with 2,080 additions and 2,080 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -18,17 +18,17 @@ jobs:
         extension: ["pdo_mysql"]
         include:
           - php-version: "5.4"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "5.5"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "5.6"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "7.0"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "7.1"
-            composer-json: "composer.json"
+            composer-json: "composer-5.4.json"
           - php-version: "7.4"
-            composer-json: "composer-7.4.json"
+            composer-json: "composer.json"
 
     services:
       mariadb:

diff --git a/composer-7.4.json → composer-5.4.json b/composer-7.4.json → composer-5.4.json
@@ -2,7 +2,7 @@
     "name": "stfc-egi/gocdb",
     "description": "A web portal and REST style API for e-Infrastructure topology managment",
     "require": {
-	"doctrine/orm": "2.6.*"
+	"doctrine/orm": "2.5.14"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.*",