From 2fe4e976eb2ce5afc95b7bce0c4bb39a52e7455b Mon Sep 17 00:00:00 2001 From: "release-github-action[bot]" <154503118+release-github-action[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:15:11 +0200 Subject: [PATCH] Update github-actions to 4.20.0 (#185) * Add the defaults for repository and ref * Support new CODECEPTION_OPTIONS, INTEGRATION_OPTIONS and UNIT_OPTIONS variables * Add 2xphp-1xMySQL templates --- .../oxid-esales/defaults/defaults_light.yaml | 15 +++++- .../oxid-esales/defaults/defaults_light.yml | 15 +++++- .../defaults/php8.0_8.1_mysql8.0_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.1_8.2_mariadb11_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.1_8.2_mysql8.0_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.2_8.3_mariadb11_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.2_8.3_mysql8.0_only.yaml | 51 +++++++++++++++++++ .../defaults/scripts/codeception.sh | 2 +- .../defaults/scripts/integration.sh | 7 ++- .github/oxid-esales/defaults/scripts/unit.sh | 7 ++- 10 files changed, 296 insertions(+), 5 deletions(-) create mode 100644 .github/oxid-esales/defaults/php8.0_8.1_mysql8.0_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.1_8.2_mariadb11_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.1_8.2_mysql8.0_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.2_8.3_mariadb11_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.2_8.3_mysql8.0_only.yaml diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml index 7afbf3cf..4d4843c8 100644 --- a/.github/oxid-esales/defaults/defaults_light.yaml +++ b/.github/oxid-esales/defaults/defaults_light.yaml @@ -70,6 +70,9 @@ global: # {{ $shop_type := "ce" }}$shop_type: {{ printf "%q" $shop_type }} # Repository related settings + # As this is only used in the install job now, this whole section will be + # moved there in v5 and no longer be aliased + git: &git # URL for the docker-eshop sdk repository to clone # Deprecated, remove in v5 @@ -81,12 +84,22 @@ global: sdk_ref: &git_sdk_ref 'master' # URL for the oxidshop_ce repository + # This is deprecated and will be superseded by "repository" as we use + # this for checking out the root composer.json and not necessarily a shop shop_url: &git_shop_url 'https://github.com/OXID-eSales/oxideshop_ce.git' # Branch, tag or hash of the commit to check out + # This is deprecated and will be superseded by "ref" in v5 shop_ref: &git_shop_ref '{{ .Github.RefName }}' - # URL for the oxidshop_pe repository + # Name of the repository containing the root composer.json + # This can be used for private repositories as you can't use composer.root_url + repository: 'OXID-eSales/oxideshop_ce' + + # Branch to use for the repository containing the root url + ref: '{{ .Github.RefName }}' + + # URL for the oxidshop_ee repository enterprise_url: 'https://github.com/OXID-eSales/oxideshop_ee.git' # Branch to check out for the enterprise repos diff --git a/.github/oxid-esales/defaults/defaults_light.yml b/.github/oxid-esales/defaults/defaults_light.yml index 7afbf3cf..4d4843c8 100644 --- a/.github/oxid-esales/defaults/defaults_light.yml +++ b/.github/oxid-esales/defaults/defaults_light.yml @@ -70,6 +70,9 @@ global: # {{ $shop_type := "ce" }}$shop_type: {{ printf "%q" $shop_type }} # Repository related settings + # As this is only used in the install job now, this whole section will be + # moved there in v5 and no longer be aliased + git: &git # URL for the docker-eshop sdk repository to clone # Deprecated, remove in v5 @@ -81,12 +84,22 @@ global: sdk_ref: &git_sdk_ref 'master' # URL for the oxidshop_ce repository + # This is deprecated and will be superseded by "repository" as we use + # this for checking out the root composer.json and not necessarily a shop shop_url: &git_shop_url 'https://github.com/OXID-eSales/oxideshop_ce.git' # Branch, tag or hash of the commit to check out + # This is deprecated and will be superseded by "ref" in v5 shop_ref: &git_shop_ref '{{ .Github.RefName }}' - # URL for the oxidshop_pe repository + # Name of the repository containing the root composer.json + # This can be used for private repositories as you can't use composer.root_url + repository: 'OXID-eSales/oxideshop_ce' + + # Branch to use for the repository containing the root url + ref: '{{ .Github.RefName }}' + + # URL for the oxidshop_ee repository enterprise_url: 'https://github.com/OXID-eSales/oxideshop_ee.git' # Branch to check out for the enterprise repos diff --git a/.github/oxid-esales/defaults/php8.0_8.1_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.0_8.1_mysql8.0_only.yaml new file mode 100644 index 00000000..1f0a6d53 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.0_8.1_mysql8.0_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.0","8.1"]' + 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.1_8.2_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.1_8.2_mariadb11_only.yaml new file mode 100644 index 00000000..7fb2c18c --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_8.2_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1","8.2"]' + mysql: '["mariadb-11"]' + +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.1_8.2_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.1_8.2_mysql8.0_only.yaml new file mode 100644 index 00000000..ef6da39e --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_8.2_mysql8.0_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1","8.2"]' + 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.2_8.3_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.2_8.3_mariadb11_only.yaml new file mode 100644 index 00000000..3fe42a97 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_8.3_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2","8.3"]' + mysql: '["mariadb-11"]' + +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.2_8.3_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.2_8.3_mysql8.0_only.yaml new file mode 100644 index 00000000..bfcc8aef --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_8.3_mysql8.0_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2","8.3"]' + 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 4c7dbad3..fcbc34be 100644 --- a/.github/oxid-esales/defaults/scripts/codeception.sh +++ b/.github/oxid-esales/defaults/scripts/codeception.sh @@ -90,7 +90,7 @@ RESULT=$? echo "Codecept build exited with error code ${RESULT}" "${CODECEPT}" run "${SUITE}" \ -c "${ABSOLUTE_PATH}/${TESTDIR}/codeception.yml" \ - --ext DotReporter \ + ${CODECEPTION_OPTIONS} \ -o "paths: output: ${OUTPUT_DIR}" 2>&1 \ | tee "${LOG_FILE}" RESULT=$? diff --git a/.github/oxid-esales/defaults/scripts/integration.sh b/.github/oxid-esales/defaults/scripts/integration.sh index a781b128..dcd4dd76 100644 --- a/.github/oxid-esales/defaults/scripts/integration.sh +++ b/.github/oxid-esales/defaults/scripts/integration.sh @@ -73,7 +73,12 @@ EOF init -"${PHPUNIT}" -c "${XML_FILE}" --bootstrap "${BOOTSTRAP}" --coverage-clover="${COVERAGE_FILE}" "${SUITE}" 2>&1 \ +"${PHPUNIT}" \ + -c "${XML_FILE}" \ + --bootstrap "${BOOTSTRAP}" \ + --coverage-clover="${COVERAGE_FILE}" \ + ${INTEGRATION_OPTIONS} \ + "${SUITE}" 2>&1 \ | tee "${LOG_FILE}" RESULT=$? echo "phpunit exited with error code ${RESULT}" diff --git a/.github/oxid-esales/defaults/scripts/unit.sh b/.github/oxid-esales/defaults/scripts/unit.sh index d844fe29..816c222d 100644 --- a/.github/oxid-esales/defaults/scripts/unit.sh +++ b/.github/oxid-esales/defaults/scripts/unit.sh @@ -73,7 +73,12 @@ EOF init -"${PHPUNIT}" -c "${XML_FILE}" --bootstrap "${BOOTSTRAP}" --coverage-clover="${COVERAGE_FILE}" "${SUITE}" 2>&1 \ +"${PHPUNIT}" \ + -c "${XML_FILE}" \ + --bootstrap "${BOOTSTRAP}" \ + --coverage-clover="${COVERAGE_FILE}" \ + ${UNIT_OPTIONS} \ + "${SUITE}" 2>&1 \ | tee "${LOG_FILE}" RESULT=$? echo "phpunit exited with error code ${RESULT}"