From 6d85ed14abec22b348f9bd8f590b9c25d71186eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Thu, 13 Jun 2024 12:33:18 +0200 Subject: [PATCH 01/16] Debug early --- .github/workflows/universal_workflow_light.yaml | 4 ++-- .github/workflows/universal_workflow_light.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index d4164773..ec44191d 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -366,7 +366,7 @@ jobs: unset INPUT_FILES INPUT_INPUT_TYPE INPUT_JSON rm .composer_merge.tmp.json fi - echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runscript_${PREFIX}_path'\033[0m" + echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runscript_${PREFIX}_path, runscript_${PREFIX}_composer_early=='${EARLY}''\033[0m" docker compose ${{ steps.iltp.outputs.install_container_method }} -T \ ${{ steps.iltp.outputs.install_container_options }} \ ${{ steps.iltp.outputs.install_container_name }} \ @@ -395,7 +395,7 @@ jobs: unset INPUT_FILES INPUT_INPUT_TYPE INPUT_JSON rm .composer_merge.tmp.json fi - echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path'\033[0m" + echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path, runscript_${PREFIX}_composer_early=='${EARLY}''\033[0m" docker compose ${{ steps.iltp.outputs.install_shop_with_modules_container_method }} -T \ ${{ steps.iltp.outputs.install_shop_with_modules_container_options }} \ ${{ steps.iltp.outputs.install_shop_with_modules_container_name }} \ diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index d4164773..ec44191d 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -366,7 +366,7 @@ jobs: unset INPUT_FILES INPUT_INPUT_TYPE INPUT_JSON rm .composer_merge.tmp.json fi - echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runscript_${PREFIX}_path'\033[0m" + echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runscript_${PREFIX}_path, runscript_${PREFIX}_composer_early=='${EARLY}''\033[0m" docker compose ${{ steps.iltp.outputs.install_container_method }} -T \ ${{ steps.iltp.outputs.install_container_options }} \ ${{ steps.iltp.outputs.install_container_name }} \ @@ -395,7 +395,7 @@ jobs: unset INPUT_FILES INPUT_INPUT_TYPE INPUT_JSON rm .composer_merge.tmp.json fi - echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path'\033[0m" + echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path, runscript_${PREFIX}_composer_early=='${EARLY}''\033[0m" docker compose ${{ steps.iltp.outputs.install_shop_with_modules_container_method }} -T \ ${{ steps.iltp.outputs.install_shop_with_modules_container_options }} \ ${{ steps.iltp.outputs.install_shop_with_modules_container_name }} \ From 6fd5e8a51b4a4e41b05e99af300a164a2524ec8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Thu, 13 Jun 2024 12:34:01 +0200 Subject: [PATCH 02/16] Debug early --- .github/workflows/universal_workflow_light.yaml | 2 +- .github/workflows/universal_workflow_light.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index ec44191d..93433ad5 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -395,7 +395,7 @@ jobs: unset INPUT_FILES INPUT_INPUT_TYPE INPUT_JSON rm .composer_merge.tmp.json fi - echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path, runscript_${PREFIX}_composer_early=='${EARLY}''\033[0m" + echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path, runslim_${PREFIX}_composer_early=='${EARLY}''\033[0m" docker compose ${{ steps.iltp.outputs.install_shop_with_modules_container_method }} -T \ ${{ steps.iltp.outputs.install_shop_with_modules_container_options }} \ ${{ steps.iltp.outputs.install_shop_with_modules_container_name }} \ diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index ec44191d..93433ad5 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -395,7 +395,7 @@ jobs: unset INPUT_FILES INPUT_INPUT_TYPE INPUT_JSON rm .composer_merge.tmp.json fi - echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path, runscript_${PREFIX}_composer_early=='${EARLY}''\033[0m" + echo -e "\033[0;35mRuning composer install for '${PREFIX}' in '${COMPOSER_PATH}' using 'runslim_${PREFIX}_path, runslim_${PREFIX}_composer_early=='${EARLY}''\033[0m" docker compose ${{ steps.iltp.outputs.install_shop_with_modules_container_method }} -T \ ${{ steps.iltp.outputs.install_shop_with_modules_container_options }} \ ${{ steps.iltp.outputs.install_shop_with_modules_container_name }} \ From dfc0a18af01f599da3dce7bfe61f5478c7f4222b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Thu, 13 Jun 2024 12:48:38 +0200 Subject: [PATCH 03/16] Add missing runscript early derfault --- .github/oxid-esales/defaults/defaults_light.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml index 68faa59b..a78bbc29 100644 --- a/.github/oxid-esales/defaults/defaults_light.yaml +++ b/.github/oxid-esales/defaults/defaults_light.yaml @@ -144,7 +144,7 @@ global: # Run composer for every module in the install job if early is set to true # Do not use this with oxideshop-ce - early: false + early: &early false # Use these settings below to merge a json configuration with an existing # composer.json @@ -293,6 +293,7 @@ runscript: &runscript cache: bucket: *cache_bucket composer: + early: *early file: 'source/dev-packages/test-module/composer.json' backup: true transform: '' From 45f562c4e175d2d902f8ace91ec2efee2d269f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Tue, 18 Jun 2024 12:24:41 +0200 Subject: [PATCH 04/16] Fix debug --- .github/oxid-esales/defaults/defaults_light.yaml | 4 ++++ .github/oxid-esales/defaults/defaults_light.yml | 7 ++++++- .github/workflows/universal_workflow_light.yaml | 6 +++--- .github/workflows/universal_workflow_light.yml | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml index a78bbc29..9c31a5a1 100644 --- a/.github/oxid-esales/defaults/defaults_light.yaml +++ b/.github/oxid-esales/defaults/defaults_light.yaml @@ -195,8 +195,12 @@ init: # This step installs the sdk, shop and module(s) install: + # This can be either 'legacy' or 'script' method: 'legacy' + # The path for the script to install the shop + script: 'source/vendor/oxid-esales/oxideshop-ce/.github/oxid-esales/install.sh' + # This step installs the sdk, shop and module(s) install_shop_with_modules: matrix: *matrix diff --git a/.github/oxid-esales/defaults/defaults_light.yml b/.github/oxid-esales/defaults/defaults_light.yml index 68faa59b..9c31a5a1 100644 --- a/.github/oxid-esales/defaults/defaults_light.yml +++ b/.github/oxid-esales/defaults/defaults_light.yml @@ -144,7 +144,7 @@ global: # Run composer for every module in the install job if early is set to true # Do not use this with oxideshop-ce - early: false + early: &early false # Use these settings below to merge a json configuration with an existing # composer.json @@ -195,8 +195,12 @@ init: # This step installs the sdk, shop and module(s) install: + # This can be either 'legacy' or 'script' method: 'legacy' + # The path for the script to install the shop + script: 'source/vendor/oxid-esales/oxideshop-ce/.github/oxid-esales/install.sh' + # This step installs the sdk, shop and module(s) install_shop_with_modules: matrix: *matrix @@ -293,6 +297,7 @@ runscript: &runscript cache: bucket: *cache_bucket composer: + early: *early file: 'source/dev-packages/test-module/composer.json' backup: true transform: '' diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 93433ad5..d1a3b116 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -563,7 +563,7 @@ jobs: run: | echo "banner 'Install shop (script)'" >>debug/debug.sh for E in $(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "_transform="); do - IFS=';' read -ra EXP <<< "$E" + IFS='=' read -ra EXP <<< "$E" VAL=("${EXP[@]:1}") # shellcheck disable=SC2145 echo "export ${EXP[0]}='${VAL[@]}'" >>debug/debug.sh @@ -574,10 +574,10 @@ jobs: chmod a+x "${SCRIPT}" "${SCRIPT}" else - echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" + echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi - EOF + 'EOF' - name: Activate modules shell: bash run: | diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index 93433ad5..d1a3b116 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -563,7 +563,7 @@ jobs: run: | echo "banner 'Install shop (script)'" >>debug/debug.sh for E in $(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "_transform="); do - IFS=';' read -ra EXP <<< "$E" + IFS='=' read -ra EXP <<< "$E" VAL=("${EXP[@]:1}") # shellcheck disable=SC2145 echo "export ${EXP[0]}='${VAL[@]}'" >>debug/debug.sh @@ -574,10 +574,10 @@ jobs: chmod a+x "${SCRIPT}" "${SCRIPT}" else - echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" + echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi - EOF + 'EOF' - name: Activate modules shell: bash run: | From ccd7b322556585c6bde0440fc5608c1750236865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Tue, 18 Jun 2024 12:37:43 +0200 Subject: [PATCH 05/16] Lint --- .github/workflows/universal_workflow_light.yaml | 3 ++- .github/workflows/universal_workflow_light.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index d1a3b116..c012f6f7 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -574,10 +574,11 @@ jobs: chmod a+x "${SCRIPT}" "${SCRIPT}" else - echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" + echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi 'EOF' + - name: Activate modules shell: bash run: | diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index d1a3b116..c012f6f7 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -574,10 +574,11 @@ jobs: chmod a+x "${SCRIPT}" "${SCRIPT}" else - echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" + echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi 'EOF' + - name: Activate modules shell: bash run: | From ee6a087fa4c6e897f3f7c2cad4d837fa23c540c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Tue, 18 Jun 2024 13:19:07 +0200 Subject: [PATCH 06/16] Fix debug --- .github/workflows/universal_workflow_light.yaml | 3 ++- .github/workflows/universal_workflow_light.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index c012f6f7..02de4fef 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -562,7 +562,8 @@ jobs: if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} run: | echo "banner 'Install shop (script)'" >>debug/debug.sh - for E in $(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "_transform="); do + VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_|_transform=") + while read -r E <<< "$VARS" ; do IFS='=' read -ra EXP <<< "$E" VAL=("${EXP[@]:1}") # shellcheck disable=SC2145 diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index c012f6f7..02de4fef 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -562,7 +562,8 @@ jobs: if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} run: | echo "banner 'Install shop (script)'" >>debug/debug.sh - for E in $(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "_transform="); do + VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_|_transform=") + while read -r E <<< "$VARS" ; do IFS='=' read -ra EXP <<< "$E" VAL=("${EXP[@]:1}") # shellcheck disable=SC2145 From e8d452e8762ad99b3eb0814192f069b1e7d3c4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Tue, 18 Jun 2024 14:43:09 +0200 Subject: [PATCH 07/16] Fix debug --- .github/workflows/universal_workflow_light.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 02de4fef..077596ae 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -563,12 +563,13 @@ jobs: run: | echo "banner 'Install shop (script)'" >>debug/debug.sh VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_|_transform=") - while read -r E <<< "$VARS" ; do + IFS=$'\n' + while read -r E ; do IFS='=' read -ra EXP <<< "$E" VAL=("${EXP[@]:1}") # shellcheck disable=SC2145 echo "export ${EXP[0]}='${VAL[@]}'" >>debug/debug.sh - done + done <<< "$VARS" cat >>debug/debug.sh < Date: Tue, 18 Jun 2024 15:03:16 +0200 Subject: [PATCH 08/16] Fix debug --- .github/workflows/universal_workflow_light.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 077596ae..d8bcd830 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -562,7 +562,7 @@ jobs: if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} run: | echo "banner 'Install shop (script)'" >>debug/debug.sh - VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_|_transform=") + VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_"|grep -v "|_transform=") IFS=$'\n' while read -r E ; do IFS='=' read -ra EXP <<< "$E" @@ -570,7 +570,7 @@ jobs: # shellcheck disable=SC2145 echo "export ${EXP[0]}='${VAL[@]}'" >>debug/debug.sh done <<< "$VARS" - cat >>debug/debug.sh <>debug/debug.sh <<'EOF' SCRIPT="source/vendor/oxid-esales/oxideshop-ce/.github/oxid-esales/install.sh" if [ -f "${SCRIPT}" ]; then chmod a+x "${SCRIPT}" @@ -579,7 +579,7 @@ jobs: echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi - 'EOF' + EOF - name: Activate modules shell: bash From 30c5975b525f1fa542f7559d0767344f3eba922c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 11:57:17 +0200 Subject: [PATCH 09/16] Fix debug --- .github/workflows/universal_workflow_light.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index d8bcd830..1f02ca31 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -517,7 +517,7 @@ jobs: key: '${{ steps.iltp.outputs.install_cache_prepared_shop_prefix }}_${{steps.itn.outputs.matrix_suffix}}' - name: Debug cache preparedShop - if: ${{ inputs.debug == 'true' && steps.iltp.outputs.install_cache_prepared_shop == true }} + if: ${{ inputs.debug == 'true' && steps.iltp.outputs.install_cache_prepared_shop == 'true' }} shell: bash run: | # install: Debug cache current installation From 928ff5f7b5bee97b8fe1c473419c451298985782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 11:57:48 +0200 Subject: [PATCH 10/16] lint --- .github/workflows/universal_workflow_light.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index 02de4fef..1f02ca31 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -517,7 +517,7 @@ jobs: key: '${{ steps.iltp.outputs.install_cache_prepared_shop_prefix }}_${{steps.itn.outputs.matrix_suffix}}' - name: Debug cache preparedShop - if: ${{ inputs.debug == 'true' && steps.iltp.outputs.install_cache_prepared_shop == true }} + if: ${{ inputs.debug == 'true' && steps.iltp.outputs.install_cache_prepared_shop == 'true' }} shell: bash run: | # install: Debug cache current installation @@ -562,14 +562,15 @@ jobs: if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} run: | echo "banner 'Install shop (script)'" >>debug/debug.sh - VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_|_transform=") - while read -r E <<< "$VARS" ; do + VARS=$(env|grep -E "^global_|^install_|^custom_|^secrets_"|grep -v "^install_shop_with_modules_"|grep -v "|_transform=") + IFS=$'\n' + while read -r E ; do IFS='=' read -ra EXP <<< "$E" VAL=("${EXP[@]:1}") # shellcheck disable=SC2145 echo "export ${EXP[0]}='${VAL[@]}'" >>debug/debug.sh - done - cat >>debug/debug.sh <>debug/debug.sh <<'EOF' SCRIPT="source/vendor/oxid-esales/oxideshop-ce/.github/oxid-esales/install.sh" if [ -f "${SCRIPT}" ]; then chmod a+x "${SCRIPT}" @@ -578,7 +579,7 @@ jobs: echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi - 'EOF' + EOF - name: Activate modules shell: bash From 24ac38c5852b285b90d63c8d47ca8e6a3b35dd84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 12:55:48 +0200 Subject: [PATCH 11/16] Add a 8.0.35 mysql template --- .../defaults/php8.1_mysql8.0.35_only.yaml | 51 +++++++++++++++++++ prepare_shop/action.yaml | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 .github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml diff --git a/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml new file mode 100644 index 00000000..ec15cfad --- /dev/null +++ b/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml @@ -0,0 +1,51 @@ +prepare_shop: + matrix: &matrix + php: '["8.1"]' + mysql: '["8.0.35"]' + +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/prepare_shop/action.yaml b/prepare_shop/action.yaml index 20d7b67e..78cfadd6 100644 --- a/prepare_shop/action.yaml +++ b/prepare_shop/action.yaml @@ -384,7 +384,7 @@ runs: docker compose ps --all - name: Output docker logs if make up failed - if: failure() + if: always() shell: bash run: | # prepare_shop: Output docker logs if make up failed From 7969cff57be52869bebc62a506d9c46b6a52c4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 12:59:00 +0200 Subject: [PATCH 12/16] Add a 8.0.35 mysql template --- .github/workflows/universal_workflow_light.yaml | 2 +- .github/workflows/universal_workflow_light.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 1f02ca31..e321dc24 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -304,7 +304,7 @@ jobs: - name: 'Prepare Shop' id: prepare_shop - uses: 'OXID-eSales/github-actions/prepare_shop@v4' + uses: 'OXID-eSales/github-actions/prepare_shop@v0' with: container_name: ${{ steps.iltp.outputs.install_container_name }} container_options: ${{ steps.iltp.outputs.install_container_options }} diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index 1f02ca31..e321dc24 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -304,7 +304,7 @@ jobs: - name: 'Prepare Shop' id: prepare_shop - uses: 'OXID-eSales/github-actions/prepare_shop@v4' + uses: 'OXID-eSales/github-actions/prepare_shop@v0' with: container_name: ${{ steps.iltp.outputs.install_container_name }} container_options: ${{ steps.iltp.outputs.install_container_options }} From 49c57be929e19034e19c1d847d8d67ef5a0a3538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 13:19:17 +0200 Subject: [PATCH 13/16] Add a 8.0.35 mysql template --- .github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml index ec15cfad..331d0ee6 100644 --- a/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml +++ b/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.1"]' - mysql: '["8.0.35"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix From 0a701d1e486c4b3916eb63eb953b2ef873012558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 13:24:53 +0200 Subject: [PATCH 14/16] Remove temp template --- .../defaults/php8.1_mysql8.0.35_only.yaml | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 .github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml diff --git a/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml deleted file mode 100644 index 331d0ee6..00000000 --- a/.github/oxid-esales/defaults/php8.1_mysql8.0.35_only.yaml +++ /dev/null @@ -1,51 +0,0 @@ -prepare_shop: - matrix: &matrix - php: '["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 From aedaba0f333653d9f975b63063040dcc7248af0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Wed, 19 Jun 2024 13:26:15 +0200 Subject: [PATCH 15/16] Pin MySQL8.0 container to 8.0.36 for now --- .github/oxid-esales/defaults/php8.0_mysql8.0_only.yaml | 2 +- .github/oxid-esales/defaults/php8.0_mysql8.0_only.yml | 2 +- .github/oxid-esales/defaults/php8.1_mysql8.0_only.yaml | 2 +- .github/oxid-esales/defaults/php8.1_mysql8.0_only.yml | 2 +- .github/oxid-esales/defaults/php8.2_mysql8.0_only.yaml | 2 +- .github/oxid-esales/defaults/php8.2_mysql8.0_only.yml | 2 +- .github/oxid-esales/defaults/php8.3_mysql8.0_only.yaml | 2 +- .github/oxid-esales/defaults/php8.3_mysql8.0_only.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yaml index 6154b23a..88d08fd8 100644 --- a/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yaml +++ b/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yaml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.0"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yml b/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yml index 6154b23a..88d08fd8 100644 --- a/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yml +++ b/.github/oxid-esales/defaults/php8.0_mysql8.0_only.yml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.0"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yaml index f674cd26..331d0ee6 100644 --- a/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yaml +++ b/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yaml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.1"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yml b/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yml index f674cd26..331d0ee6 100644 --- a/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yml +++ b/.github/oxid-esales/defaults/php8.1_mysql8.0_only.yml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.1"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yaml index bc92a750..7a3a9d0d 100644 --- a/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yaml +++ b/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yaml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.2"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yml b/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yml index bc92a750..7a3a9d0d 100644 --- a/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yml +++ b/.github/oxid-esales/defaults/php8.2_mysql8.0_only.yml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.2"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yaml b/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yaml index 9c18256a..28e20b5e 100644 --- a/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yaml +++ b/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yaml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.3"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yml b/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yml index 9c18256a..28e20b5e 100644 --- a/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yml +++ b/.github/oxid-esales/defaults/php8.3_mysql8.0_only.yml @@ -1,7 +1,7 @@ prepare_shop: matrix: &matrix php: '["8.3"]' - mysql: '["8.0"]' + mysql: '["8.0.36"]' install_shop: matrix: *matrix From 92e3e2b70b90f3ad1be06b14b4c24a18bb82fed1 Mon Sep 17 00:00:00 2001 From: joernott Date: Wed, 19 Jun 2024 11:27:29 +0000 Subject: [PATCH 16/16] Update versions --- .github/workflows/universal_workflow_light.yaml | 2 +- .github/workflows/universal_workflow_light.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index e321dc24..1f02ca31 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -304,7 +304,7 @@ jobs: - name: 'Prepare Shop' id: prepare_shop - uses: 'OXID-eSales/github-actions/prepare_shop@v0' + uses: 'OXID-eSales/github-actions/prepare_shop@v4' with: container_name: ${{ steps.iltp.outputs.install_container_name }} container_options: ${{ steps.iltp.outputs.install_container_options }} diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index e321dc24..1f02ca31 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -304,7 +304,7 @@ jobs: - name: 'Prepare Shop' id: prepare_shop - uses: 'OXID-eSales/github-actions/prepare_shop@v0' + uses: 'OXID-eSales/github-actions/prepare_shop@v4' with: container_name: ${{ steps.iltp.outputs.install_container_name }} container_options: ${{ steps.iltp.outputs.install_container_options }}