Merge branch 'release/2.5.5' into devmode-vite

nystudio107 · Mar 28, 2022 · f1b5d9a · f1b5d9a
2 parents 06a95fa + b70db61
commit f1b5d9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/devmode Change Log
 
+## 2.5.5 - 2022.03.28
+### Changed
+* Add `disableProcessTimeout` to the `post-craft-update` Composer scripts, and run Project Config before migrations
+
 ## 2.5.4 - 2022.03.26
 ### Added
 * Ensure permissions on directories Craft needs to write to

diff --git a/cms/composer.json b/cms/composer.json
@@ -66,9 +66,10 @@
     "pre-craft-update": [
     ],
     "post-craft-update": [
+      "Composer\\Config::disableProcessTimeout",
       "@php craft install/check && php craft clear-caches/all --interactive=0 || exit 0",
-      "@php craft install/check && php craft migrate/all --interactive=0 || exit 0",
-      "@php craft install/check && php craft project-config/apply --interactive=0 || exit 0"
+      "@php craft install/check && php craft project-config/apply --interactive=0 || exit 0",
+      "@php craft install/check && php craft migrate/all --interactive=0 || exit 0"
     ],
     "post-root-package-install": [
       "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""