From 8e229a9f4d35b77d5035bfec569ed2f1df0ae656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 26 Aug 2024 12:30:03 +0200 Subject: [PATCH 1/9] Fix token handling in styles action --- .github/oxid-esales/defaults/scripts/check_log.sh | 2 +- .github/workflows/call-universal_test_workflow.yaml | 9 +++++++++ .github/workflows/call-universal_test_workflow.yml | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/oxid-esales/defaults/scripts/check_log.sh b/.github/oxid-esales/defaults/scripts/check_log.sh index 53341a74..995fae52 100755 --- a/.github/oxid-esales/defaults/scripts/check_log.sh +++ b/.github/oxid-esales/defaults/scripts/check_log.sh @@ -38,7 +38,7 @@ while read -r LINE ; do grep -E "${LINE}" "${LOG_FILE}" RESULT=1 else - echo -e "\033[0;32m Log dioes not contain matching pattern ${LINE}" + echo -e "\033[0;32m Log does not contain matching pattern ${LINE}" fi fi done <"${PATTERN_FILE}" diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml index 4d506f4f..26a68484 100644 --- a/.github/workflows/call-universal_test_workflow.yaml +++ b/.github/workflows/call-universal_test_workflow.yaml @@ -1592,6 +1592,15 @@ jobs: docker_token: ${{ secrets.DOCKER_HUB_TOKEN }} debug: ${{ needs.init.outputs.debug }} + - name: Update the github token + run: | + # Update github token + ${{ inputs.debug }} + docker compose exec -T \ + ${{ steps.styles_testplan.outputs.runscript_container_options }} \ + ${{ steps.styles_testplan.outputs.runscript_container_name }} \ + composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" + - name: 'Modify composer.json' if: ${{ steps.styles_testplan.outputs.styles_composer_transform != '' }} uses: 'OXID-eSales/github-actions/composer_merge@v4' diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml index 4d506f4f..26a68484 100644 --- a/.github/workflows/call-universal_test_workflow.yml +++ b/.github/workflows/call-universal_test_workflow.yml @@ -1592,6 +1592,15 @@ jobs: docker_token: ${{ secrets.DOCKER_HUB_TOKEN }} debug: ${{ needs.init.outputs.debug }} + - name: Update the github token + run: | + # Update github token + ${{ inputs.debug }} + docker compose exec -T \ + ${{ steps.styles_testplan.outputs.runscript_container_options }} \ + ${{ steps.styles_testplan.outputs.runscript_container_name }} \ + composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" + - name: 'Modify composer.json' if: ${{ steps.styles_testplan.outputs.styles_composer_transform != '' }} uses: 'OXID-eSales/github-actions/composer_merge@v4' From f65ace7c362bfdcf8c2efcd3b22c2bf482889576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Tue, 27 Aug 2024 13:35:45 +0200 Subject: [PATCH 2/9] Add suffix to sed -i to make in MAC compatible and fix prepare_shop --- .github/oxid-esales/defaults/scripts/check_log.sh | 2 +- .github/workflows/dispatch-release.yaml | 2 +- .github/workflows/universal_workflow_light.yaml | 4 ++-- .github/workflows/universal_workflow_light.yml | 4 ++-- append_report/action.yaml | 2 +- codeception/action.yaml | 2 +- phpcs/action.yaml | 2 +- phpmd/action.yaml | 2 +- phpstan/action.yaml | 2 +- phpunit/action.yaml | 2 +- prepare_shop/action.yaml | 6 +++--- run_custom_scripts/action.yaml | 2 +- runtests/action.yaml | 2 +- sonarcloud/action.yaml | 4 ++-- start_shop/action.yaml | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/oxid-esales/defaults/scripts/check_log.sh b/.github/oxid-esales/defaults/scripts/check_log.sh index 995fae52..ee03ebc2 100755 --- a/.github/oxid-esales/defaults/scripts/check_log.sh +++ b/.github/oxid-esales/defaults/scripts/check_log.sh @@ -30,7 +30,7 @@ fi [[ ${RESULT} -gt 0 ]] && exit 1 # shellcheck disable=SC2016 -sed -e 's|(.*)\r|$1|' -i "${PATTERN_FILE}" +sed -e 's|(.*)\r|$1|' -i.backup "${PATTERN_FILE}" while read -r LINE ; do if [ -n "${LINE}" ]; then if grep -q -E "${LINE}" "${LOG_FILE}"; then diff --git a/.github/workflows/dispatch-release.yaml b/.github/workflows/dispatch-release.yaml index 0d14a33b..fc0d25c4 100644 --- a/.github/workflows/dispatch-release.yaml +++ b/.github/workflows/dispatch-release.yaml @@ -84,7 +84,7 @@ jobs: FILES=$(find . -iname '*.yml' -o -name "*.yaml") for FILE in ${FILES}; do sed -E 's|OXID-eSales/github-actions/(.*)@v([0-9][0-9]*)|OXID-eSales/github-actions/\1@v${{ inputs.major}}|g' \ - -i "${FILE}" + -i.backup "${FILE}" done STATUS=$(git status -s) if [ -n "${STATUS}" ]; then diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index b4ec0434..90058082 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -116,9 +116,9 @@ jobs: if [ '${{ github.event_name }}' == 'pull_request' ]; then REF=$(echo '{{ .Github.HeadRef }}'|sed -e 's|/refs/heads/||') # This is the git ref name - sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' # This is the same for composer but with an added dev- prefix - sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' fi TESTPLAN=$(echo "${{ inputs.testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g') diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index b4ec0434..90058082 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -116,9 +116,9 @@ jobs: if [ '${{ github.event_name }}' == 'pull_request' ]; then REF=$(echo '{{ .Github.HeadRef }}'|sed -e 's|/refs/heads/||') # This is the git ref name - sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|safe_ref_name:.*|safe_ref_name: ${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' # This is the same for composer but with an added dev- prefix - sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' + sed -e "s|ref_name: dev-.*|ref_name: dev-${REF}|" -i.backup '${{ inputs.plan_folder }}/defaults/defaults_light.yaml' fi TESTPLAN=$(echo "${{ inputs.testplan }}"|sed -e 's|~|${{ inputs.plan_folder }}|g') diff --git a/append_report/action.yaml b/append_report/action.yaml index 40cb0cc6..2b150d40 100644 --- a/append_report/action.yaml +++ b/append_report/action.yaml @@ -129,7 +129,7 @@ runs: rm debug/debug.sh fi if [ -n "${{ inputs.github_token }}" ]; then - sed -e 's|${{ inputs.github_token}}|${DEBUG_GH_TOKEN}|g' -i "${DEBUG_FILE}" + sed -e 's|${{ inputs.github_token}}|${DEBUG_GH_TOKEN}|g' -i.backup "${DEBUG_FILE}" fi cat >>"${DEBUG_FILE}" <failure_pattern.tmp <failure_pattern.tmp <failure_pattern.tmp <failure_pattern.tmp <failure_pattern.tmp <targets.tmp <failure_pattern.tmp < Date: Wed, 28 Aug 2024 10:10:44 +0200 Subject: [PATCH 3/9] Fox token update --- .github/workflows/call-universal_test_workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml index 26a68484..51ae8b3b 100644 --- a/.github/workflows/call-universal_test_workflow.yaml +++ b/.github/workflows/call-universal_test_workflow.yaml @@ -1597,8 +1597,8 @@ jobs: # Update github token ${{ inputs.debug }} docker compose exec -T \ - ${{ steps.styles_testplan.outputs.runscript_container_options }} \ - ${{ steps.styles_testplan.outputs.runscript_container_name }} \ + ${{ steps.styles_testplan.outputs.styles_composer_update_options }} \ + ${{ steps.styles_testplan.outputs.styles_container_name }} \ composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" - name: 'Modify composer.json' From 8dcfb9adbad23aa759a60f5190e6803c64fb06c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 28 Aug 2024 10:42:30 +0200 Subject: [PATCH 4/9] Fox token update --- .github/workflows/call-universal_test_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml index 26a68484..51ae8b3b 100644 --- a/.github/workflows/call-universal_test_workflow.yml +++ b/.github/workflows/call-universal_test_workflow.yml @@ -1597,8 +1597,8 @@ jobs: # Update github token ${{ inputs.debug }} docker compose exec -T \ - ${{ steps.styles_testplan.outputs.runscript_container_options }} \ - ${{ steps.styles_testplan.outputs.runscript_container_name }} \ + ${{ steps.styles_testplan.outputs.styles_composer_update_options }} \ + ${{ steps.styles_testplan.outputs.styles_container_name }} \ composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" - name: 'Modify composer.json' From 08a0217b0ffc4c09844a13458e5e220294da5e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 28 Aug 2024 11:39:25 +0200 Subject: [PATCH 5/9] Lint --- .github/workflows/call-universal_test_workflow.yaml | 2 +- .github/workflows/call-universal_test_workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml index 51ae8b3b..ed85c590 100644 --- a/.github/workflows/call-universal_test_workflow.yaml +++ b/.github/workflows/call-universal_test_workflow.yaml @@ -1597,7 +1597,7 @@ jobs: # Update github token ${{ inputs.debug }} docker compose exec -T \ - ${{ steps.styles_testplan.outputs.styles_composer_update_options }} \ + ${{ steps.styles_testplan.outputs.styles_container_options }} \ ${{ steps.styles_testplan.outputs.styles_container_name }} \ composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml index 51ae8b3b..ed85c590 100644 --- a/.github/workflows/call-universal_test_workflow.yml +++ b/.github/workflows/call-universal_test_workflow.yml @@ -1597,7 +1597,7 @@ jobs: # Update github token ${{ inputs.debug }} docker compose exec -T \ - ${{ steps.styles_testplan.outputs.styles_composer_update_options }} \ + ${{ steps.styles_testplan.outputs.styles_container_options }} \ ${{ steps.styles_testplan.outputs.styles_container_name }} \ composer config -g github-oauth.github.com "${{ secrets.enterprise_github_token || github.token }}" From 074bae84ded220b52a9d1422811a84515233d02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Fri, 30 Aug 2024 11:38:57 +0200 Subject: [PATCH 6/9] Fix the testplan cache name --- .github/oxid-esales/defaults/scheduled.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/oxid-esales/defaults/scheduled.yaml b/.github/oxid-esales/defaults/scheduled.yaml index a3ed13d9..597822a7 100644 --- a/.github/oxid-esales/defaults/scheduled.yaml +++ b/.github/oxid-esales/defaults/scheduled.yaml @@ -12,6 +12,10 @@ global: composer: &composer ref_name: 'dev-{{ .Data.global.git.default_ref }}' +init: + cache: + name: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}-testplan-{{ .Env.GITHUB_REPOSITORY_ID }}-{{ .Github.SHA }}-{{ .Github.RunID }}' + install_shop_with_modules: &install git: *git composer: *composer From 1564456c73ddb13ea616f8cfd1d561f94ced3c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Fri, 30 Aug 2024 11:42:51 +0200 Subject: [PATCH 7/9] lint --- .github/oxid-esales/defaults/scheduled.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/oxid-esales/defaults/scheduled.yml b/.github/oxid-esales/defaults/scheduled.yml index a3ed13d9..597822a7 100644 --- a/.github/oxid-esales/defaults/scheduled.yml +++ b/.github/oxid-esales/defaults/scheduled.yml @@ -12,6 +12,10 @@ global: composer: &composer ref_name: 'dev-{{ .Data.global.git.default_ref }}' +init: + cache: + name: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}-testplan-{{ .Env.GITHUB_REPOSITORY_ID }}-{{ .Github.SHA }}-{{ .Github.RunID }}' + install_shop_with_modules: &install git: *git composer: *composer From 646a88417baee3e56bd125602e2dd69e0e5846cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Fri, 30 Aug 2024 11:54:39 +0200 Subject: [PATCH 8/9] Add templates to test new MySQL/MariaDB images --- .../defaults/php8.1_mariadb10_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.1_mariadb11_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.1_mysql8_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.1_mysql9_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.2_mariadb10_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.2_mariadb11_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.2_mysql8_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.2_mysql9_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.3_mariadb10_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.3_mariadb11_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.3_mysql8_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.3_mysql9_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.4_mariadb10_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.4_mariadb11_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.4_mysql8_only.yaml | 51 +++++++++++++++++++ .../defaults/php8.4_mysql9_only.yaml | 51 +++++++++++++++++++ 16 files changed, 816 insertions(+) create mode 100644 .github/oxid-esales/defaults/php8.1_mariadb10_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.1_mariadb11_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.1_mysql8_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.1_mysql9_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.2_mariadb10_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.2_mariadb11_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.2_mysql8_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.2_mysql9_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.3_mariadb10_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.3_mariadb11_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.3_mysql8_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.3_mysql9_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.4_mariadb10_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.4_mariadb11_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.4_mysql8_only.yaml create mode 100644 .github/oxid-esales/defaults/php8.4_mysql9_only.yaml diff --git a/.github/oxid-esales/defaults/php8.1_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.1_mariadb10_only.yaml new file mode 100644 index 00000000..2bef2fb1 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["mariadb-10"]' + +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_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.1_mariadb11_only.yaml new file mode 100644 index 00000000..f08d2a0a --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + 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_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql8_only.yaml new file mode 100644 index 00000000..d9e9f396 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["mysql-8"]' + +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_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql9_only.yaml new file mode 100644 index 00000000..d4b5be5e --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mysql9_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["mysql-9"]' + +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_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.2_mariadb10_only.yaml new file mode 100644 index 00000000..e8c5c9e0 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2"]' + mysql: '["mariadb-10"]' + +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_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.2_mariadb11_only.yaml new file mode 100644 index 00000000..e7b08aa0 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["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.2_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.2_mysql8_only.yaml new file mode 100644 index 00000000..0f35009a --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2"]' + mysql: '["mysql-8"]' + +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_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.2_mysql9_only.yaml new file mode 100644 index 00000000..a54c2f7d --- /dev/null +++ b/.github/oxid-esales/defaults/php8.2_mysql9_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.2"]' + mysql: '["mysql-9"]' + +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.3_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.3_mariadb10_only.yaml new file mode 100644 index 00000000..ec49faa5 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.3"]' + mysql: '["mariadb-10"]' + +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.3_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.3_mariadb11_only.yaml new file mode 100644 index 00000000..0b11c338 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["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.3_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.3_mysql8_only.yaml new file mode 100644 index 00000000..5dd18a91 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.3"]' + mysql: '["mysql-8"]' + +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.3_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.3_mysql9_only.yaml new file mode 100644 index 00000000..5f466103 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.3_mysql9_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.3"]' + mysql: '["mysql-9"]' + +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_mariadb10_only.yaml b/.github/oxid-esales/defaults/php8.4_mariadb10_only.yaml new file mode 100644 index 00000000..d7c6df79 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mariadb10_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["mariadb-10"]' + +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_mariadb11_only.yaml b/.github/oxid-esales/defaults/php8.4_mariadb11_only.yaml new file mode 100644 index 00000000..8d606432 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mariadb11_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + 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.4_mysql8_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql8_only.yaml new file mode 100644 index 00000000..31162c58 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql8_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["mysql-8"]' + +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_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql9_only.yaml new file mode 100644 index 00000000..f28358a8 --- /dev/null +++ b/.github/oxid-esales/defaults/php8.4_mysql9_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.4"]' + mysql: '["mysql-9"]' + +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 From 6d5e72928683d8c9d847f32908251e89ef3121bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 2 Sep 2024 14:11:58 +0200 Subject: [PATCH 9/9] Remove mysql9 until -debian images are there --- .../defaults/php8.1_mysql9_only.yaml | 51 ------------------- .../defaults/php8.2_mysql9_only.yaml | 51 ------------------- .../defaults/php8.3_mysql9_only.yaml | 51 ------------------- .../defaults/php8.4_mysql9_only.yaml | 51 ------------------- 4 files changed, 204 deletions(-) delete mode 100644 .github/oxid-esales/defaults/php8.1_mysql9_only.yaml delete mode 100644 .github/oxid-esales/defaults/php8.2_mysql9_only.yaml delete mode 100644 .github/oxid-esales/defaults/php8.3_mysql9_only.yaml delete mode 100644 .github/oxid-esales/defaults/php8.4_mysql9_only.yaml diff --git a/.github/oxid-esales/defaults/php8.1_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql9_only.yaml deleted file mode 100644 index d4b5be5e..00000000 --- a/.github/oxid-esales/defaults/php8.1_mysql9_only.yaml +++ /dev/null @@ -1,51 +0,0 @@ -prepare_shop: - matrix: &matrix - php: '["8.1"]' - mysql: '["mysql-9"]' - -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_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.2_mysql9_only.yaml deleted file mode 100644 index a54c2f7d..00000000 --- a/.github/oxid-esales/defaults/php8.2_mysql9_only.yaml +++ /dev/null @@ -1,51 +0,0 @@ -prepare_shop: - matrix: &matrix - php: '["8.2"]' - mysql: '["mysql-9"]' - -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.3_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.3_mysql9_only.yaml deleted file mode 100644 index 5f466103..00000000 --- a/.github/oxid-esales/defaults/php8.3_mysql9_only.yaml +++ /dev/null @@ -1,51 +0,0 @@ -prepare_shop: - matrix: &matrix - php: '["8.3"]' - mysql: '["mysql-9"]' - -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_mysql9_only.yaml b/.github/oxid-esales/defaults/php8.4_mysql9_only.yaml deleted file mode 100644 index f28358a8..00000000 --- a/.github/oxid-esales/defaults/php8.4_mysql9_only.yaml +++ /dev/null @@ -1,51 +0,0 @@ -prepare_shop: - matrix: &matrix - php: '["8.4"]' - mysql: '["mysql-9"]' - -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