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

.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

.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

.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

.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

.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

.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

.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

.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=$?

.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}"

.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}"