Merge branch 'main' into patch-6

georgringer · Jul 29, 2024 · 8034022 · 8034022
2 parents 1d058c4 + 4fd1206
commit 8034022
Show file tree

Hide file tree

Showing 17 changed files with 527 additions and 784 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,3 +8,5 @@
 /.scrutinizer export-ignore
 /.styleci.yml export-ignore
 /.travis.yml export-ignore
+/composer.json.orig export-ignore
+/composer.json.testing export-ignore
diff --git a/.github/workflows/core11.yml b/.github/workflows/core11.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Validate composer.json and composer.lock
-        run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s composer -e 'validate'
+        run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s composer -- validate --no-check-lock
 
       - name: Install testing system
         run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }}

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -12,6 +12,4 @@ jobs:
 
       - name: Test if the documentation will render without warnings
         run: |
-          mkdir -p Documentation-GENERATED-temp \
-          && docker run --rm --pull always -v $(pwd):/project \
-             ghcr.io/typo3-documentation/render-guides:latest --config=Documentation --no-progress --fail-on-log
+          Build/Scripts/runTests.sh -s docsGenerate -- --no-progress
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /Build/testing-docker/.env
 .cache
 /composer.lock
+/composer.json.orig
 /composer.json.testing
 /.php_cs.cache
 /.php-cs-fixer.cache