Merge pull request #4110 from neos/task/speed-up-ci-run

bwaidelich · web-flow · commit 6268a2f0e321 · 2023-03-27T17:58:59.000+02:00
TASK: Speed up CI build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -115,7 +115,6 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, json, zlib, iconv, intl, pdo_sqlite, mysql, pgsql, redis, memcached, memcache, apcu
-          coverage: xdebug #optional
           ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on
 
       - name: Checkout development distribution
@@ -252,7 +251,7 @@ jobs:
           # DEBUG MODE: ALTERNATIVELY, comment in the following lines to dump the DB.
           # do not exit the script if the tests break; as we want to upload the database dumps afterwards.
           set +e
-          composer test:behavioral:stop-on-failure
+          CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1 composer test:behavioral:stop-on-failure
           retVal=$?
 
           # automatically search for race conditions
diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/RoutingTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/RoutingTrait.php
@@ -290,7 +290,6 @@ private function resolveUrl(string $nodeAggregateId, string $contentStreamId, st
         if ($this->requestUrl === null) {
             $this->iAmOnUrl('/');
         }
-        putenv('FLOW_REWRITEURLS=1');
         $nodeAddress = new NodeAddress(
             ContentStreamId::fromString($contentStreamId),
             DimensionSpacePoint::fromJsonString($dimensionSpacePoint),
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendRouting/Basic.feature b/Neos.Neos/Tests/Behavior/Features/FrontendRouting/Basic.feature
@@ -8,11 +8,17 @@ Feature: Basic routing functionality (match & resolve document nodes in one dime
     And I have the following NodeTypes configuration:
     """
     'Neos.Neos:Sites': {}
+    'Neos.Neos:Document': {}
+    'Neos.Neos:Content': {}
     'Neos.EventSourcedNeosAdjustments:Test.Routing.Page':
+      superTypes:
+        'Neos.Neos:Document': true
       properties:
         uriPathSegment:
           type: string
     'Neos.EventSourcedNeosAdjustments:Test.Routing.Content':
+      superTypes:
+        'Neos.Neos:Content': true
       properties:
         uriPathSegment:
           type: string
@@ -37,7 +43,6 @@ Feature: Basic routing functionality (match & resolve document nodes in one dime
     #        earl-o-documentbourgh
     #      nody-mc-nodeface
     #
-    # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)
     And I am in content stream "cs-identifier" and dimension space point {}
     And the following CreateNodeAggregateWithNode commands are executed:
       | nodeAggregateId        | parentNodeAggregateId  | nodeTypeName                                          | initialPropertyValues                    | nodeName |
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendRouting/Dimensions.feature b/Neos.Neos/Tests/Behavior/Features/FrontendRouting/Dimensions.feature
@@ -21,7 +21,6 @@ Feature: Routing functionality with multiple content dimensions
       | coveredDimensionSpacePoints | [{"market":"DE", "language":"en"},{"market":"DE", "language":"de"},{"market":"DE", "language":"gsw"},{"market":"CH", "language":"en"},{"market":"CH", "language":"de"},{"market":"CH", "language":"gsw"}] |
       | nodeAggregateClassification | "root"                                                                                                                                                                                                    |
     And the graph projection is fully up to date
-    # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)
     And I am in content stream "cs-identifier" and dimension space point {"market":"DE", "language":"en"}
     And the following CreateNodeAggregateWithNode commands are executed:
       | nodeAggregateId        | parentNodeAggregateId  | nodeTypeName                                       | initialPropertyValues           | nodeName |
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendRouting/DisableNodes.feature b/Neos.Neos/Tests/Behavior/Features/FrontendRouting/DisableNodes.feature
@@ -8,11 +8,17 @@ Feature: Routing behavior of removed, disabled and re-enabled nodes
     And I have the following NodeTypes configuration:
     """
     'Neos.Neos:Sites': {}
+    'Neos.Neos:Document': {}
+    'Neos.Neos:Content': {}
     'Neos.EventSourcedNeosAdjustments:Test.Routing.Page':
+      superTypes:
+        'Neos.Neos:Document': true
       properties:
         uriPathSegment:
           type: string
     'Neos.EventSourcedNeosAdjustments:Test.Routing.Content':
+      superTypes:
+        'Neos.Neos:Content': true
       properties:
         uriPathSegment:
           type: string
@@ -38,7 +44,6 @@ Feature: Routing behavior of removed, disabled and re-enabled nodes
     #          leaf-mc-node
     #      nody-mc-nodeface
     #
-    # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)
     And I am in content stream "cs-identifier" and dimension space point {}
     And the following CreateNodeAggregateWithNode commands are executed:
       | nodeAggregateId        | parentNodeAggregateId  | nodeTypeName                                          | initialPropertyValues                    | nodeName |
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendRouting/MultiSiteLinking.feature b/Neos.Neos/Tests/Behavior/Features/FrontendRouting/MultiSiteLinking.feature
@@ -24,7 +24,6 @@ Feature: Linking between multiple websites
     #        duke-of-contentshire (content node)
     #        earl-o-documentbourgh
     #
-    # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)
     And I am in content stream "cs-identifier" and dimension space point {}
     And the following CreateNodeAggregateWithNode commands are executed:
       | nodeAggregateId         | parentNodeAggregateId  | nodeTypeName                                       | initialPropertyValues                    | nodeName |
diff --git a/Neos.Neos/Tests/Behavior/Features/FrontendRouting/Shortcuts.feature b/Neos.Neos/Tests/Behavior/Features/FrontendRouting/Shortcuts.feature
@@ -31,7 +31,6 @@ Feature: Routing behavior of shortcut nodes
     #      sir-david-nodenborough-ii
     #        sir-nodeward-nodington-iii
     #
-    # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)
     And I am in content stream "cs-identifier" and dimension space point {}
     And the following CreateNodeAggregateWithNode commands are executed:
       | nodeAggregateId            | parentNodeAggregateId     | nodeTypeName                                       | initialPropertyValues                                                                                                       | nodeName |

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,6 @@ private function resolveUrl(string $nodeAggregateId, string $contentStreamId, st`
`290`	`290`	`if ($this->requestUrl === null) {`
`291`	`291`	`$this->iAmOnUrl('/');`
`292`	`292`	`}`
`293`		`- putenv('FLOW_REWRITEURLS=1');`
`294`	`293`	`$nodeAddress = new NodeAddress(`
`295`	`294`	`ContentStreamId::fromString($contentStreamId),`
`296`	`295`	`DimensionSpacePoint::fromJsonString($dimensionSpacePoint),`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ Feature: Linking between multiple websites`
`24`	`24`	`# duke-of-contentshire (content node)`
`25`	`25`	`# earl-o-documentbourgh`
`26`	`26`	`#`
`27`		`- # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)`
`28`	`27`	`And I am in content stream "cs-identifier" and dimension space point {}`
`29`	`28`	`And the following CreateNodeAggregateWithNode commands are executed:`
`30`	`29`	`\| nodeAggregateId \| parentNodeAggregateId \| nodeTypeName \| initialPropertyValues \| nodeName \|`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ Feature: Routing behavior of shortcut nodes`
`31`	`31`	`# sir-david-nodenborough-ii`
`32`	`32`	`# sir-nodeward-nodington-iii`
`33`	`33`	`#`
`34`		`- # NOTE: The "nodeName" column only exists because it's currently not possible to create unnamed nodes (see https://github.com/neos/contentrepository-development-collection/pull/162)`
`35`	`34`	`And I am in content stream "cs-identifier" and dimension space point {}`
`36`	`35`	`And the following CreateNodeAggregateWithNode commands are executed:`
`37`	`36`	`\| nodeAggregateId \| parentNodeAggregateId \| nodeTypeName \| initialPropertyValues \| nodeName \|`