From 923bf1fb7e34909c36b5ab1f9cbe2c490fd78f01 Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Tue, 6 Feb 2024 19:56:25 +0100 Subject: [PATCH] chore(tests): cover PHP 8.3 --- .github/workflows/acceptance-tests.yml | 56 +++++++++--------- .github/workflows/publish-ter.yml | 4 +- .github/workflows/unit-tests.yml | 82 +++++++++++++------------- composer.json | 4 +- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 352027ba..412de7d2 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -20,26 +20,26 @@ jobs: strategy: fail-fast: false matrix: - php-version: ["8.1", "8.2"] - browser: [chrome] - theme: [bootstrap3-banner, bootstrap3-modal, bootstrap4-modal, bootstrap5-modal, customtheme] + php-version: [ "8.1", "8.2", "8.3" ] + browser: [ chrome ] + theme: [ bootstrap3-banner, bootstrap3-modal, bootstrap4-modal, bootstrap5-modal, customtheme ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Set PHP version - - run: | - sed -i -e 's/^php_version:.*/php_version: ${{ matrix.php-version }}/g' .ddev/config.yaml + - run: | + sed -i -e 's/^php_version:.*/php_version: ${{ matrix.php-version }}/g' .ddev/config.yaml # Start ddev - - uses: ddev/github-action-setup-ddev@v1 + - uses: ddev/github-action-setup-ddev@v1 # Setup tests - - run: ddev composer cookieman:${{ matrix.theme }} + - run: ddev composer cookieman:${{ matrix.theme }} # Run tests - - run: ddev composer test:acceptance:${{ matrix.browser }} + - run: ddev composer test:acceptance:${{ matrix.browser }} # Save acceptance reports - - uses: actions/upload-artifact@master - with: - name: ${{ matrix.browser }}-${{ matrix.theme }}-${{ matrix.php-version }}-ar - path: Build/AcceptanceReports - if: always() + - uses: actions/upload-artifact@master + with: + name: ${{ matrix.browser }}-${{ matrix.theme }}-${{ matrix.php-version }}-ar + path: Build/AcceptanceReports + if: always() acceptance-tests-firefox: runs-on: ubuntu-22.04 @@ -50,23 +50,23 @@ jobs: strategy: fail-fast: false matrix: - php-version: ["8.1"] - browser: [firefox] - theme: [bootstrap3-banner, bootstrap3-modal, bootstrap4-modal, bootstrap5-modal, customtheme] + php-version: [ "8.3" ] + browser: [ firefox ] + theme: [ bootstrap3-banner, bootstrap3-modal, bootstrap4-modal, bootstrap5-modal, customtheme ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Set PHP version - - run: | - sed -i -e 's/^php_version:.*/php_version: ${{ matrix.php-version }}/g' .ddev/config.yaml + - run: | + sed -i -e 's/^php_version:.*/php_version: ${{ matrix.php-version }}/g' .ddev/config.yaml # Start ddev - - uses: ddev/github-action-setup-ddev@v1 + - uses: ddev/github-action-setup-ddev@v1 # Setup tests - - run: ddev composer cookieman:${{ matrix.theme }} + - run: ddev composer cookieman:${{ matrix.theme }} # Run tests - - run: ddev composer test:acceptance:${{ matrix.browser }} + - run: ddev composer test:acceptance:${{ matrix.browser }} # Save acceptance reports - - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.browser }}-${{ matrix.theme }}-${{ matrix.php-version }}-ar - path: Build/AcceptanceReports - if: always() + - uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.browser }}-${{ matrix.theme }}-${{ matrix.php-version }}-ar + path: Build/AcceptanceReports + if: always() diff --git a/.github/workflows/publish-ter.yml b/.github/workflows/publish-ter.yml index ea70fe25..29d4f94f 100644 --- a/.github/workflows/publish-ter.yml +++ b/.github/workflows/publish-ter.yml @@ -13,7 +13,7 @@ jobs: TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check tag run: | @@ -32,7 +32,7 @@ jobs: comment="${comment//'%'/'%25'}" comment="${comment//$'\n'/'%0A'}" comment="${comment//$'\r'/'%0D'}" - + if [[ -z "${comment// }" ]]; then echo ::set-output name=comment::Released version ${{ steps.get-version.outputs.version }} of ${{ env.TYPO3_EXTENSION_KEY }} else diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6e971f16..ead116e1 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -1,46 +1,46 @@ name: CGL & unit tests on: - push: - branches: - - '**' - - '!l10n_*' - pull_request: - branches: - - '**' - - '!l10n_*' + push: + branches: + - '**' + - '!l10n_*' + pull_request: + branches: + - '**' + - '!l10n_*' jobs: - unit-tests: - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - matrix: - php-version: ["8.1", "8.2"] - steps: - - uses: actions/checkout@v3 - - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - extensions: intl, mbstring, json, zip, curl - tools: composer:v2 - - run: composer update --no-interaction --no-progress - - run: composer show - - run: composer tests-for:ci - unit-tests-lowest: - runs-on: ubuntu-22.04 - continue-on-error: true - strategy: - fail-fast: false - matrix: - php-version: ["8.1", "8.2"] - steps: - - uses: actions/checkout@v3 - - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - extensions: intl, mbstring, json, zip, curl - tools: composer:v2 - - run: composer update --no-interaction --prefer-lowest --no-progress - - run: composer show - - run: composer tests-for:ci + unit-tests: + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + php-version: [ "8.1", "8.2", "8.3" ] + steps: + - uses: actions/checkout@v4 + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + extensions: intl, mbstring, json, zip, curl + tools: composer:v2 + - run: composer update --no-interaction --no-progress + - run: composer show + - run: composer tests-for:ci + unit-tests-lowest: + runs-on: ubuntu-22.04 + continue-on-error: true + strategy: + fail-fast: false + matrix: + php-version: [ "8.1", "8.2", "8.3" ] + steps: + - uses: actions/checkout@v4 + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + extensions: intl, mbstring, json, zip, curl + tools: composer:v2 + - run: composer update --no-interaction --prefer-lowest --no-progress + - run: composer show + - run: composer tests-for:ci diff --git a/composer.json b/composer.json index 39b12927..5e233a35 100644 --- a/composer.json +++ b/composer.json @@ -26,14 +26,14 @@ "dmind/cookieman-test": "@dev", "dmind/cookieman-test-bootstrap3-banner": "@dev", "friendsofphp/php-cs-fixer": "^3.49", - "helhum/typo3-console": "^8.0", + "helhum/typo3-console": "^8.1.1", "phpspec/prophecy-phpunit": "^2.1", "phpunit/phpunit": "^10.5", "typo3/cms-install": "^12 || 12.*.x-dev || dev-main", "typo3/cms-tstemplate": "^12 || 12.*.x-dev || dev-main", "typo3/coding-standards": "0.7.1", "typo3/tailor": "^1.5", - "typo3/testing-framework": "^7.0" + "typo3/testing-framework": "^7.0.4" }, "config": { "bin-dir": ".build/bin",