Skip to content

Commit

Permalink
[TASK] Streamline Build/Scripts/runTests.sh (#2480)
Browse files Browse the repository at this point in the history
This change modifies the `Build/Scripts/runTests.sh`
execution wrapper to be in line with current TYPO3
core implementation.

This contains following tasks:

* Modify `Build/Scripts/runTests.sh`:
    * `-b <container-binary>` switch to determine which
      container binary should be used.
    * Remove the usage of `docker-compose.yml` file and
      usage by replacing container execution call with
      docker or podman binary calls.
    * Include `bash trap` logic for container/network
      cleanup on abort signals.
    * deprecated the `-e` option in favour of direct
      command expansion using `--`.
* Refactor suit command execution without docker-compose.
* Remove `Build/testing-docker/docker-compose.yml` due
  to being obsolete now.
* Add composer related temporary files to `.gitignore`
  and `.gitattributes`.
* Add documentation rendering and test rendering to the
  `runTests.sh`.
* Switched composer validate to remove deprecated `-e`
  option usage in GitHub action workflow and added the
  `--no-check-lock` option to mitigate lock file errors
  due to core switches.
* Add `-s docsGenerate` as suite to `Build/Scripts/runTests.sh`
  to render the documentation.
  • Loading branch information
sbuerk authored May 22, 2024
1 parent 7e6d8f8 commit 9c74fd8
Show file tree
Hide file tree
Showing 6 changed files with 452 additions and 700 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/core11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/Build/testing-docker/.env
.cache
/composer.lock
/composer.json.orig
/composer.json.testing
/.php_cs.cache
/.php-cs-fixer.cache
Expand Down
Loading

0 comments on commit 9c74fd8

Please sign in to comment.