diff --git a/.github/workflows/core11.yml b/.github/workflows/core13.yml similarity index 51% rename from .github/workflows/core11.yml rename to .github/workflows/core13.yml index 6c33e5e8ef..d32131d25c 100644 --- a/.github/workflows/core11.yml +++ b/.github/workflows/core13.yml @@ -1,55 +1,49 @@ -name: core 11 +name: core 12 on: [ push, pull_request ] jobs: tests: - name: v11 + name: v12 runs-on: ubuntu-20.04 strategy: # This prevents cancellation of matrix job runs, if one/two already failed and let the # rest matrix jobs be executed anyway. fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '8.2', '8.3' ] composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ] steps: - name: Checkout 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' - - name: Install testing system - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }} + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s ${{ matrix.composerInstall }} - name: Lint PHP - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s lint + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s lint - name: Validate code against CGL - run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s cgl -n + run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s cgl -n - name: Unit Tests - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s unit + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -s unit - name: Functional Tests with mariadb and mysqli - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -d mariadb -a mysqli -s functional + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -a mysqli -s functional - name: Functional Tests with mariadb and pdo_mysql - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -d mariadb -a pdo_mysql -s functional + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -a pdo_mysql -s functional - name: Functional Tests with mysql and mysqli - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -d mysql -a mysqli -s functional + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -a mysqli -s functional - name: Functional Tests with mysql and pdo_mysql - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -d mysql -a pdo_mysql -s functional + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -a pdo_mysql -s functional - name: Functional Tests with postgres - # v11 postgres functional disabled with PHP 8.2 since https://github.com/doctrine/dbal/commit/73eec6d882b99e1e2d2d937accca89c1bd91b2d7 - # is not fixed in doctrine core v11 doctrine 2.13.9 - if: ${{ matrix.php <= '8.1' }} - run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -d postgres -s functional + run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -s functional # @todo disabled, due cross dbmns issues in code. Should be fixed first # - name: Functional Tests with sqlite - # run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -d sqlite -s functional \ No newline at end of file + # run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d sqlite -s functional \ No newline at end of file diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index ef70d0fd57..9d400a0df6 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -141,11 +141,11 @@ Options: - 8.2: use PHP 8.2 - 8.3: use PHP 8.3 - -t <11|12> + -t <12|13> Only with -s composerUpdate Specifies the TYPO3 core major version to be used - - 11 (default): use TYPO3 core v11 - - 12: use TYPO3 core v12 + - 12 (default): use TYPO3 core v12 + - 13: use TYPO3 core v13 -e "" Only with -s functional|unit|composer @@ -267,13 +267,13 @@ while getopts ":s:a:d:i:j:k:p:t:e:xy:z:nhuv" OPT; do ;; p) PHP_VERSION=${OPTARG} - if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3)$ ]]; then + if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3)$ ]]; then INVALID_OPTIONS+=("p ${OPTARG}") fi ;; t) TYPO3_VERSION=${OPTARG} - if ! [[ ${TYPO3_VERSION} =~ ^(11|12)$ ]]; then + if ! [[ ${TYPO3_VERSION} =~ ^(12|13)$ ]]; then INVALID_OPTIONS+=("p ${OPTARG}") fi ;;