Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/9.0' into task/adjust-to-flow-ch…
Browse files Browse the repository at this point in the history
…anges
  • Loading branch information
mhsdesign committed Sep 12, 2024
2 parents adb4e9d + f738c2d commit 9bd0352
Show file tree
Hide file tree
Showing 1,130 changed files with 54,438 additions and 57,727 deletions.
14 changes: 0 additions & 14 deletions .composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
},
"suggest": {
},
"provide": {
},
"scripts": {
"lint:phpcs": "../../bin/phpcs --colors",
"lint:phpcs:fix": "../../bin/phpcbf --colors",
Expand All @@ -32,9 +30,6 @@
"FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php",
"FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php"
],
"test:functional": [
"../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.Core/Tests/Functional"
],
"test:behat-cli": "../../bin/behat -f progress --strict --no-interaction",
"test:behavioral": [
"@test:behat-cli -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
Expand All @@ -45,10 +40,6 @@
"../../flow doctrine:migrate --quiet; ../../flow cr:setup",
"@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml"
],
"test:behavioral:sync": [
"@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
"@test:behavioral"
],
"test:behavioral:stop-on-failure": [
"@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
"@test:behat-cli -vvv --stop-on-failure -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist",
Expand All @@ -58,13 +49,8 @@
"../../flow doctrine:migrate --quiet; ../../flow cr:setup",
"@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml"
],
"test:behavioral:stop-on-failure:sync": [
"@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
"@test:behavioral:stop-on-failure"
],
"test": [
"@test:unit",
"@test:functional",
"@test:behavioral",
"@test:parallel"
],
Expand Down
92 changes: 0 additions & 92 deletions .github/CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/add-pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Maybe remove base branch label
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
working-directory: .

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: ${{ env.NEOS_FOLDER }}

Expand All @@ -118,7 +118,7 @@ jobs:
ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on

- name: Checkout development distribution
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: neos/neos-development-distribution
ref: ${{ env.NEOS_TARGET_VERSION }}
Expand All @@ -137,7 +137,7 @@ jobs:
- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
uses: actions/cache@v4
timeout-minutes: 30
with:
path: |
Expand Down Expand Up @@ -251,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:sync
composer test:behavioral:stop-on-failure
retVal=$?
# automatically search for race conditions
Expand Down Expand Up @@ -284,10 +284,10 @@ jobs:
# END OF DEBUG SCRIPT
- name: Upload Postgres/Mysql DB dump
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: matrix.parallel-parts == 'escr-behavioral'
with:
name: database-dumps
name: database-dumps-${{ matrix.php-versions }}-${{ matrix.dependencies }}-${{ matrix.parallel-parts }}
path: Data/DebugDatabaseDumps

- name: Fail pipeline if ES CR tests broke (after uploading artifacts)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doctum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-api-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build API documentation
# we need this fix: https://github.com/code-lts/doctum/issues/59 so we need to run @dev
Expand All @@ -23,7 +23,7 @@ jobs:
cli-args: "--output-format=github --no-ansi --no-progress --ignore-parse-errors --only-version=${{ github.ref_name }}"

- name: Check out documentation site
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: neos/neos.github.io
path: docs-site
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/postgresql-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
working-directory: .

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: ${{ env.NEOS_FOLDER }}

Expand All @@ -80,7 +80,7 @@ jobs:
ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on

- name: Checkout development distribution
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: neos/neos-development-distribution
ref: ${{ env.NEOS_TARGET_VERSION }}
Expand All @@ -102,7 +102,7 @@ jobs:
- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.cache/composer
Expand Down
Loading

0 comments on commit 9bd0352

Please sign in to comment.