diff --git a/.github/oxid-esales/defaults/7.2.x.yaml b/.github/oxid-esales/defaults/7.2.x.yaml index aefa1269..d7890670 100644 --- a/.github/oxid-esales/defaults/7.2.x.yaml +++ b/.github/oxid-esales/defaults/7.2.x.yaml @@ -1,7 +1,7 @@ workflow: matrix: &matrix # We only test the latest recommended versions here but both template engines - php: &matrix_php '["8.1","8.2"]' + php: &matrix_php '["8.2","8.3"]' mysql: &matrix_mysql '["5.7","8.0.36"]' matrix_slim: &matrix_slim php: '["8.2"]' diff --git a/.github/oxid-esales/defaults/7.2.x.yml b/.github/oxid-esales/defaults/7.2.x.yml index aefa1269..d7890670 100644 --- a/.github/oxid-esales/defaults/7.2.x.yml +++ b/.github/oxid-esales/defaults/7.2.x.yml @@ -1,7 +1,7 @@ workflow: matrix: &matrix # We only test the latest recommended versions here but both template engines - php: &matrix_php '["8.1","8.2"]' + php: &matrix_php '["8.2","8.3"]' mysql: &matrix_mysql '["5.7","8.0.36"]' matrix_slim: &matrix_slim php: '["8.2"]' diff --git a/.github/oxid-esales/defaults/defaults.yaml b/.github/oxid-esales/defaults/defaults.yaml index ca28fd8a..cdd9f02e 100644 --- a/.github/oxid-esales/defaults/defaults.yaml +++ b/.github/oxid-esales/defaults/defaults.yaml @@ -35,7 +35,7 @@ workflow: # a matrix of all combinations of these values for testing. matrix: &matrix # This string contains a json array of php versions to test against. - php: &matrix_php '["8.1","8.2"]' + php: &matrix_php '["8.2","8.3"]' # This json array are the mysql versions to test mysql: &matrix_mysql '["5.7","8.0.36"]' diff --git a/.github/oxid-esales/defaults/defaults.yml b/.github/oxid-esales/defaults/defaults.yml index ca28fd8a..cdd9f02e 100644 --- a/.github/oxid-esales/defaults/defaults.yml +++ b/.github/oxid-esales/defaults/defaults.yml @@ -35,7 +35,7 @@ workflow: # a matrix of all combinations of these values for testing. matrix: &matrix # This string contains a json array of php versions to test against. - php: &matrix_php '["8.1","8.2"]' + php: &matrix_php '["8.2","8.3"]' # This json array are the mysql versions to test mysql: &matrix_mysql '["5.7","8.0.36"]' diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml index 5e39f20b..09b2c3c5 100644 --- a/.github/oxid-esales/defaults/defaults_light.yaml +++ b/.github/oxid-esales/defaults/defaults_light.yaml @@ -35,7 +35,7 @@ workflow: # a matrix of all combinations of these values for testing. matrix: &matrix # This string contains a json array of php versions to test against. - php: &matrix_php '["8.1","8.2"]' + php: &matrix_php '["8.2","8.3"]' # This string contains a json array of mysql versions to test mysql: &matrix_mysql '["5.7","8.0.36"]' diff --git a/.github/oxid-esales/defaults/defaults_light.yml b/.github/oxid-esales/defaults/defaults_light.yml index 5e39f20b..09b2c3c5 100644 --- a/.github/oxid-esales/defaults/defaults_light.yml +++ b/.github/oxid-esales/defaults/defaults_light.yml @@ -35,7 +35,7 @@ workflow: # a matrix of all combinations of these values for testing. matrix: &matrix # This string contains a json array of php versions to test against. - php: &matrix_php '["8.1","8.2"]' + php: &matrix_php '["8.2","8.3"]' # This string contains a json array of mysql versions to test mysql: &matrix_mysql '["5.7","8.0.36"]' diff --git a/.github/oxid-esales/defaults/php8.4_mysql5.7_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql5.7_only.yaml new file mode 100644 index 00000000..60d6a8d1 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql5.7_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["5.7"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.4_mysql5.7_only.yml b/.github/oxid-esales/defaults/php8.4_mysql5.7_only.yml new file mode 100644 index 00000000..60d6a8d1 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql5.7_only.yml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["5.7"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml new file mode 100644 index 00000000..0aecbada --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["8.0.36"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml new file mode 100644 index 00000000..0aecbada --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql8.0_only.yml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["8.0.36"]' + +install_shop: + matrix: *matrix + max_parallel: 1 + +install_module: + matrix: *matrix + max_parallel: 1 + +install_shop_with_modules: + matrix: *matrix + max_parallel: 1 + +runscript: + matrix: *matrix + +runslim: + matrix: *matrix + +phpunit: + matrix: *matrix + +codeception: + matrix: *matrix + +runtest: + matrix: *matrix + +sonarcloud: + matrix: *matrix + max_parallel: 1 + +phpcs_tests: + matrix: *matrix + max_parallel: 1 + +phpmd: + matrix: *matrix + max_parallel: 1 + +phpstan: + matrix: *matrix + max_parallel: 1 + +styles: + matrix: *matrix + max_parallel: 1 diff --git a/.github/oxid-esales/defaults/scripts/codeception.sh b/.github/oxid-esales/defaults/scripts/codeception.sh index 7ca25c3e..4c7dbad3 100644 --- a/.github/oxid-esales/defaults/scripts/codeception.sh +++ b/.github/oxid-esales/defaults/scripts/codeception.sh @@ -1,5 +1,6 @@ #!/bin/bash set -e +set -x SUITE="${1}" function init() { @@ -44,7 +45,7 @@ function init() { fi fi LOG_FILE="${OUTPUT_DIR}/codeception_${SUITE}.txt" - PATTERN_FILE="${SCRIPT_DIR}/codeception_failure_pattern.txt" + PATTERN_FILE="${SCRIPT_DIR}codeception_failure_pattern.txt" CODECEPT="vendor/bin/codecept" if [ ! -f "${CODECEPT}" ]; then @@ -84,7 +85,7 @@ function wait_for_selenium() { init wait_for_selenium -"${CODECEPT}" build -c "${ABSOLUTE_PATH}/tests/codeception.yml" +"${CODECEPT}" build -c "${ABSOLUTE_PATH}/${TESTDIR}/codeception.yml" RESULT=$? echo "Codecept build exited with error code ${RESULT}" "${CODECEPT}" run "${SUITE}" \ @@ -94,4 +95,4 @@ echo "Codecept build exited with error code ${RESULT}" | tee "${LOG_FILE}" RESULT=$? echo "Codecept run exited with error code ${RESULT}" -"$SCRIPT_DIR/check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}" +"${SCRIPT_DIR}check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}" diff --git a/.github/oxid-esales/defaults/scripts/integration.sh b/.github/oxid-esales/defaults/scripts/integration.sh index ef80c948..a781b128 100644 --- a/.github/oxid-esales/defaults/scripts/integration.sh +++ b/.github/oxid-esales/defaults/scripts/integration.sh @@ -32,7 +32,7 @@ function init() { fi LOG_FILE="${OUTPUT_DIR}/phpunit_integration.txt" - PATTERN_FILE="${SCRIPT_DIR}/integration_failure_pattern.txt" + PATTERN_FILE="${SCRIPT_DIR}integration_failure_pattern.txt" PHPUNIT="vendor/bin/phpunit" if [ ! -f "${PHPUNIT}" ]; then @@ -45,7 +45,7 @@ function init() { BOOTSTRAP="/var/www/source/bootstrap.php" if [ ! -f "${BOOTSTRAP}" ]; then - BOOTSTRAP="/var/www/vendor/oxid-esales/oxideshop-ce/${TESTDIR}/bootstrap.php" + BOOTSTRAP="/var/www/vendor/oxid-esales/oxideshop-ce/tests/bootstrap.php" if [ ! -f "${BOOTSTRAP}" ]; then echo -e "\033[0;31mCould not find bootstrap.php in /var/www/tests or /var/www/oxid-esales/oxideshop-ce/tests\033[0m" find /var/www -iname "bootstrap.php" @@ -53,7 +53,7 @@ function init() { fi fi - XML_FILE="${ABSOLUTE_PATH}/tests/phpunit.xml" + XML_FILE="${ABSOLUTE_PATH}/${TESTDIR}/phpunit.xml" COVERAGE_FILE="${REPORT_DIR}/coverage_phpunit_integration.xml" cat <