Fix issue with flex, with Symfony upgrade to 5.4 and sync-recipes on …

…init (#670)
inviqa · Feb 22, 2022 · b942027 · b942027
1 parent ee7161e
commit b942027
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/src/symfony/.ci/sample-static/init.sh b/src/symfony/.ci/sample-static/init.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -o errexit
+
+if ! [ -e symfony.lock ]; then
+    ws set app.build dynamic
+
+    # ensure a full build is done dynamically to get all repo artifacts
+    export MY127WS_ENV=local # static tests switch to pipeline
+    ws harness prepare
+    ws enable console
+    ws destroy
+
+    ws set app.build static
+fi 
+
diff --git a/src/symfony/.ci/sample-static/workspace.yml b/src/symfony/.ci/sample-static/workspace.yml
@@ -9,4 +9,6 @@ attribute('app.repository'): null
 attribute('aws.access_key_id'): null
 attribute('aws.secret_access_key'): null
 
+attribute('docker.port_forward.enabled'): false
+
 attribute('composer.auth.github'): = decrypt("YTozOntpOjA7czo3OiJkZWZhdWx0IjtpOjE7czoyNDoiZfbsRN210rxOzGyHhH74tuXtFxak6prxIjtpOjI7czo1Njoi7NjB2oXZJ3/wQsccea2VPeYEjU72koVub89ezkdQzAzOaaFwD2Rm1pbhWXR7aYgpUdXmNmO8g5YiO30=")
diff --git a/src/symfony/application/skeleton/composer.json.twig b/src/symfony/application/skeleton/composer.json.twig
@@ -7,11 +7,13 @@
         "php": ">= 8.0",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "symfony/console": "5.2.*",
-        "symfony/dotenv": "5.2.*",
-        "symfony/flex": "^1.12",
-        "symfony/framework-bundle": "5.2.*",
-        "symfony/yaml": "5.2.*"
+        "symfony/console": "~5.4",
+        "symfony/dotenv": "~5.4",
+        "symfony/flex": "^2.1",
+        "symfony/framework-bundle": "~5.4",
+        "symfony/runtime": "~5.4",
+        "symfony/translation": "~5.4",
+        "symfony/yaml": "~5.4"
     },
     "require-dev": {
         "behat/behat": "^3.5",
@@ -32,6 +34,10 @@
         "symfony/phpunit-bridge": "^5.2"
     },
     "config": {
+        "allow-plugins": {
+            "symfony/flex": true,
+            "symfony/runtime": true
+        },
         "bin-dir": "bin",
         "optimize-autoloader": true,
         "platform": {
@@ -71,6 +77,7 @@
             "@auto-scripts"
         ],
         "post-update-cmd": [
+            "[ -e symfony.lock ] || composer sync-recipes",
             "@auto-scripts"
         ],
         "test": [

diff --git a/test b/test
@@ -112,6 +112,11 @@ function setup()
 function prepare_environment()
 (
     cd "${path_test}"
+
+    if [ -e init.sh ]; then
+        bash -x ./init.sh
+    fi
+
     ws harness prepare
 )