Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update github-actions to 4.15.3 #174

Merged
merged 23 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/7.2.x.yaml
Original file line number Diff line number Diff line change
@@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/7.2.x.yml
Original file line number Diff line number Diff line change
@@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/defaults_light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion .github/oxid-esales/defaults/defaults_light.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand Down
51 changes: 51 additions & 0 deletions .github/oxid-esales/defaults/php8.4_mysql5.7_only.yaml
Original file line number Diff line number Diff line change
@@ -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
51 changes: 51 additions & 0 deletions .github/oxid-esales/defaults/php8.4_mysql5.7_only.yml
Original file line number Diff line number Diff line change
@@ -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
51 changes: 51 additions & 0 deletions .github/oxid-esales/defaults/php8.4_mysql8.0_only.yaml
Original file line number Diff line number Diff line change
@@ -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
51 changes: 51 additions & 0 deletions .github/oxid-esales/defaults/php8.4_mysql8.0_only.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions .github/oxid-esales/defaults/scripts/codeception.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
set -e
set -x
SUITE="${1}"

function init() {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}" \
Expand All @@ -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}"
8 changes: 4 additions & 4 deletions .github/oxid-esales/defaults/scripts/integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,15 +45,15 @@ 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"
exit 1
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 <<EOF
Expand All @@ -77,4 +77,4 @@ init
| tee "${LOG_FILE}"
RESULT=$?
echo "phpunit exited with error code ${RESULT}"
"${SCRIPT_DIR}/check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
"${SCRIPT_DIR}check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
1 change: 0 additions & 1 deletion .github/oxid-esales/defaults/scripts/php-cs-report.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash
set -e
set -x
function init() {
if [[ ${BASH_SOURCE} = */* ]]; then
SCRIPT_DIR=${BASH_SOURCE%/*}/
Expand Down
6 changes: 3 additions & 3 deletions .github/oxid-esales/defaults/scripts/unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function init() {
fi

LOG_FILE="${OUTPUT_DIR}/phpunit_unit.txt"
PATTERN_FILE="${SCRIPT_DIR}/unit_failure_pattern.txt"
PATTERN_FILE="${SCRIPT_DIR}unit_failure_pattern.txt"

PHPUNIT="vendor/bin/phpunit"
if [ ! -f "${PHPUNIT}" ]; then
Expand All @@ -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"
Expand Down Expand Up @@ -77,4 +77,4 @@ init
| tee "${LOG_FILE}"
RESULT=$?
echo "phpunit exited with error code ${RESULT}"
"${SCRIPT_DIR}/check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
"${SCRIPT_DIR}check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"