From a48ed6e07d04fb8186b11d7e45b6b08b2049c93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Thu, 27 Jun 2024 10:51:15 +0200 Subject: [PATCH 01/10] Add docker logs output --- .github/oxid-esales/defaults/defaults.yaml | 5 +++++ .github/oxid-esales/defaults/defaults.yml | 5 +++++ .github/oxid-esales/defaults/defaults_light.yaml | 1 + .github/oxid-esales/defaults/defaults_light.yml | 1 + .github/workflows/universal_workflow_light.yaml | 15 ++++++++------- .github/workflows/universal_workflow_light.yml | 15 ++++++++------- prepare_shop/action.yaml | 1 - run_test_script/action.yaml | 5 +++++ stop_shop/action.yaml | 11 +++++++++++ 9 files changed, 44 insertions(+), 15 deletions(-) diff --git a/.github/oxid-esales/defaults/defaults.yaml b/.github/oxid-esales/defaults/defaults.yaml index 3c4388de..ca28fd8a 100644 --- a/.github/oxid-esales/defaults/defaults.yaml +++ b/.github/oxid-esales/defaults/defaults.yaml @@ -243,6 +243,7 @@ install_shop: output: &install_output files: | docker-compose.yml + docker*.log source/composer.json* source/composer.lock source/source/config.inc.php @@ -286,6 +287,7 @@ install_module: output: files: | docker-compose.yml + docker*.log source/composer.json* source/composer.lock source/source/config.inc.php @@ -371,6 +373,7 @@ phpunit: output: # Which files should be archived files: | + docker*.log source/source/log/oxideshop.log data/php/logs/error_log.txt job_status*.txt @@ -465,6 +468,7 @@ codeception: output: files: | docker-compose.yml + docker*.log source/composer.json source/composer.lock source/source/config.inc.php @@ -531,6 +535,7 @@ runtest: output: files: | + docker*.log source/unit.cov source/source/log/oxideshop.log source/test_config.yml diff --git a/.github/oxid-esales/defaults/defaults.yml b/.github/oxid-esales/defaults/defaults.yml index 3c4388de..ca28fd8a 100644 --- a/.github/oxid-esales/defaults/defaults.yml +++ b/.github/oxid-esales/defaults/defaults.yml @@ -243,6 +243,7 @@ install_shop: output: &install_output files: | docker-compose.yml + docker*.log source/composer.json* source/composer.lock source/source/config.inc.php @@ -286,6 +287,7 @@ install_module: output: files: | docker-compose.yml + docker*.log source/composer.json* source/composer.lock source/source/config.inc.php @@ -371,6 +373,7 @@ phpunit: output: # Which files should be archived files: | + docker*.log source/source/log/oxideshop.log data/php/logs/error_log.txt job_status*.txt @@ -465,6 +468,7 @@ codeception: output: files: | docker-compose.yml + docker*.log source/composer.json source/composer.lock source/source/config.inc.php @@ -531,6 +535,7 @@ runtest: output: files: | + docker*.log source/unit.cov source/source/log/oxideshop.log source/test_config.yml diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml index 0783f334..c68300cd 100644 --- a/.github/oxid-esales/defaults/defaults_light.yaml +++ b/.github/oxid-esales/defaults/defaults_light.yaml @@ -270,6 +270,7 @@ install_shop_with_modules: output: files: | docker-compose.yml + docker*.log source/composer.json* source/composer.lock source/source/config.inc.php diff --git a/.github/oxid-esales/defaults/defaults_light.yml b/.github/oxid-esales/defaults/defaults_light.yml index 0783f334..c68300cd 100644 --- a/.github/oxid-esales/defaults/defaults_light.yml +++ b/.github/oxid-esales/defaults/defaults_light.yml @@ -270,6 +270,7 @@ install_shop_with_modules: output: files: | docker-compose.yml + docker*.log source/composer.json* source/composer.lock source/source/config.inc.php diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 6d807709..c6a5beae 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -496,7 +496,7 @@ jobs: - name: 'Stop shop for preparedShop cache' if: ${{ steps.iltp.outputs.install_cache_prepared_shop == 'true' }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} @@ -628,6 +628,7 @@ jobs: with: name: '${{ steps.iltp.outputs.install_output_artifact_prefix }}-${{steps.itn.outputs.matrix_suffix}}' path: |- + docker*.log files.txt generated_testplan.yaml load_testplan_install.log @@ -647,7 +648,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} @@ -849,7 +850,7 @@ jobs: token: ${{ github.token }} - name: 'Run runscript check' - uses: 'OXID-eSales/github-actions/run_test_script@v4' + uses: 'OXID-eSales/github-actions/run_test_script@v0' with: script: ${{ steps.rt.outputs.runscript_script }} path: ${{ steps.rt.outputs.runscript_path }} @@ -871,13 +872,13 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} - name: 'Write Report' if: always() - uses: OXID-eSales/github-actions/append_report@v4 + uses: OXID-eSales/github-actions/append_report@v0 with: prefix: '${{ needs.init.outputs.global_title }}' priority: '100' @@ -1032,7 +1033,7 @@ jobs: debug: ${{ needs.init.outputs.debug }} - name: 'Run runslim check' - uses: 'OXID-eSales/github-actions/run_test_script@v4' + uses: 'OXID-eSales/github-actions/run_test_script@v0' with: script: ${{ steps.rt.outputs.runslim_script }} path: ${{ steps.rt.outputs.runslim_path }} @@ -1054,7 +1055,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index 6d807709..c6a5beae 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -496,7 +496,7 @@ jobs: - name: 'Stop shop for preparedShop cache' if: ${{ steps.iltp.outputs.install_cache_prepared_shop == 'true' }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} @@ -628,6 +628,7 @@ jobs: with: name: '${{ steps.iltp.outputs.install_output_artifact_prefix }}-${{steps.itn.outputs.matrix_suffix}}' path: |- + docker*.log files.txt generated_testplan.yaml load_testplan_install.log @@ -647,7 +648,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} @@ -849,7 +850,7 @@ jobs: token: ${{ github.token }} - name: 'Run runscript check' - uses: 'OXID-eSales/github-actions/run_test_script@v4' + uses: 'OXID-eSales/github-actions/run_test_script@v0' with: script: ${{ steps.rt.outputs.runscript_script }} path: ${{ steps.rt.outputs.runscript_path }} @@ -871,13 +872,13 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} - name: 'Write Report' if: always() - uses: OXID-eSales/github-actions/append_report@v4 + uses: OXID-eSales/github-actions/append_report@v0 with: prefix: '${{ needs.init.outputs.global_title }}' priority: '100' @@ -1032,7 +1033,7 @@ jobs: debug: ${{ needs.init.outputs.debug }} - name: 'Run runslim check' - uses: 'OXID-eSales/github-actions/run_test_script@v4' + uses: 'OXID-eSales/github-actions/run_test_script@v0' with: script: ${{ steps.rt.outputs.runslim_script }} path: ${{ steps.rt.outputs.runslim_path }} @@ -1054,7 +1055,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v4' + uses: 'OXID-eSales/github-actions/stop_shop@v0' with: debug: ${{ needs.init.outputs.debug }} diff --git a/prepare_shop/action.yaml b/prepare_shop/action.yaml index 78cfadd6..c517f044 100644 --- a/prepare_shop/action.yaml +++ b/prepare_shop/action.yaml @@ -388,7 +388,6 @@ runs: shell: bash run: | # prepare_shop: Output docker logs if make up failed - echo -e "\033[0;31m### Starting docker failed\033[0m" echo -e "\033[0;35m### docker-compose.yml ###\033[0m" cat docker-compose.yml echo -e "\033[0;35m### docker compose logs ###\033[0m" diff --git a/run_test_script/action.yaml b/run_test_script/action.yaml index e52abb49..17f4e3e1 100644 --- a/run_test_script/action.yaml +++ b/run_test_script/action.yaml @@ -103,6 +103,11 @@ runs: cp data/php/logs/error_log.txt source/${{ inputs.path }}/tests/Output/ cp data/mysql/mysql/slow_log* source/${{ inputs.path }}/tests/Output/ cp data/mysql/mysql/general_log* source/${{ inputs.path }}/tests/Output/ + docker compose logs --tail=all >source/${{ inputs.path }}/tests/Output/docker-compose.log + for c in $(docker ps -aq); do + echo -e "\033[0;35m### Logs for $c ###\033[0m" + docker logs -n 2000 $c >source/${{ inputs.path }}/tests/Output/docker-$c.log + done - name: Upload artifact if: always() diff --git a/stop_shop/action.yaml b/stop_shop/action.yaml index 5bbe9f0b..e526b47a 100644 --- a/stop_shop/action.yaml +++ b/stop_shop/action.yaml @@ -10,6 +10,17 @@ inputs: runs: using: "composite" steps: + - name: Output docker logs + if: always() + shell: bash + run: | + # stop_shop: Output docker logs if make up failed + docker compose logs --tail=all >>docker-compose.log + for c in $(docker ps -aq); do + echo -e "\033[0;35m### Logs for $c ###\033[0m" + docker logs -n 2000 $c >docker-$c.log + done + - name: Stop containers if: always() shell: bash From 8b47450779746b2f34917077a68fee452d28e7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 09:46:38 +0200 Subject: [PATCH 02/10] Move debug generation for install script before script execution --- .../workflows/universal_workflow_light.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index c6a5beae..b6b272d4 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -551,18 +551,6 @@ jobs: config_idebug: ${{ steps.iltp.outputs.install_config_idebug }} debug: ${{ needs.init.outputs.debug }} - - name: 'Install shop (script)' - if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} - run: | - SCRIPT="${{ steps.iltp.outputs.install_script }}" - if [ -f "${SCRIPT}" ]; then - chmod a+x "${SCRIPT}" - "${SCRIPT}" - else - echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" - exit 1 - fi - - name: 'Debug Install shop (script)' if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} run: | @@ -586,6 +574,18 @@ jobs: fi EOF + - name: 'Install shop (script)' + if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} + run: | + SCRIPT="${{ steps.iltp.outputs.install_script }}" + if [ -f "${SCRIPT}" ]; then + chmod a+x "${SCRIPT}" + "${SCRIPT}" + else + echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" + exit 1 + fi + - name: Activate modules shell: bash run: | From df72d2fe5d224d984447c9a34f717b5c179f1172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 09:52:39 +0200 Subject: [PATCH 03/10] Add comment for module activation to generate the banner in the debug script --- .github/workflows/universal_workflow_light.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index b6b272d4..535fb2a9 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -589,6 +589,7 @@ jobs: - name: Activate modules shell: bash run: | + # Activate modules ${{ needs.init.outputs.debug }} if [ -f 'source/bin/oe-console' ]; then OE_CONSOLE='bin/oe-console' From 4cec9dd74ceff0161d1432b90c2e67c17bf90d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 11:17:24 +0200 Subject: [PATCH 04/10] Output php error log after install, if it is not empty --- .github/workflows/universal_workflow_light.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 535fb2a9..791b4f6e 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -572,6 +572,10 @@ jobs: echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi + if [ -s data/php/logs/error_log.txt ]; then + echo -e "\033[0;35mPHP error log\033[0m" + cat data/php/logs/error_log.txt + fi EOF - name: 'Install shop (script)' @@ -585,6 +589,10 @@ jobs: echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" exit 1 fi + if [ -s data/php/logs/error_log.txt ]; then + echo -e "\033[0;35mPHP error log\033[0m" + cat data/php/logs/error_log.txt + fi - name: Activate modules shell: bash From 600ffef15770137d86286624af6715804cda4d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 12:04:08 +0200 Subject: [PATCH 05/10] Fix variable substitution --- .github/oxid-esales/defaults/7.0.x.yaml | 14 ++++++++++---- .github/oxid-esales/defaults/7.0.x.yml | 14 ++++++++++---- .github/oxid-esales/defaults/7.1.x.yaml | 14 ++++++++++---- .github/oxid-esales/defaults/7.1.x.yml | 14 ++++++++++---- .github/oxid-esales/defaults/7.2.x.yaml | 14 ++++++++++---- .github/oxid-esales/defaults/7.2.x.yml | 14 ++++++++++---- .github/oxid-esales/defaults/ee.yaml | 11 ++++++++++- .github/oxid-esales/defaults/ee.yml | 11 ++++++++++- .github/oxid-esales/defaults/pe.yaml | 8 +++++++- .github/oxid-esales/defaults/pe.yml | 8 +++++++- .github/oxid-esales/defaults/scheduled.yaml | 5 ++++- .github/oxid-esales/defaults/scheduled.yml | 5 ++++- 12 files changed, 102 insertions(+), 30 deletions(-) diff --git a/.github/oxid-esales/defaults/7.0.x.yaml b/.github/oxid-esales/defaults/7.0.x.yaml index 1713cce3..aadb4c88 100644 --- a/.github/oxid-esales/defaults/7.0.x.yaml +++ b/.github/oxid-esales/defaults/7.0.x.yaml @@ -13,7 +13,7 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.0.x -prepare_shop: +install: &install matrix: *matrix git: *git composer: @@ -32,19 +32,25 @@ prepare_shop: } } +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install install_shop: matrix: *matrix git: *git +install_shop: + matrix: *matrix + git: *git + +install_shop_with_modules: *install + install_module: matrix: *matrix git: module: ref: *default_ref composer: *composer - -install_shop_with_modules: - matrix: *matrix +# END Deprecated runscript: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.0.x.yml b/.github/oxid-esales/defaults/7.0.x.yml index 1713cce3..aadb4c88 100644 --- a/.github/oxid-esales/defaults/7.0.x.yml +++ b/.github/oxid-esales/defaults/7.0.x.yml @@ -13,7 +13,7 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.0.x -prepare_shop: +install: &install matrix: *matrix git: *git composer: @@ -32,19 +32,25 @@ prepare_shop: } } +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install install_shop: matrix: *matrix git: *git +install_shop: + matrix: *matrix + git: *git + +install_shop_with_modules: *install + install_module: matrix: *matrix git: module: ref: *default_ref composer: *composer - -install_shop_with_modules: - matrix: *matrix +# END Deprecated runscript: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.1.x.yaml b/.github/oxid-esales/defaults/7.1.x.yaml index 18b9b1fc..e0b10bcb 100644 --- a/.github/oxid-esales/defaults/7.1.x.yaml +++ b/.github/oxid-esales/defaults/7.1.x.yaml @@ -13,7 +13,7 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.1.x -prepare_shop: +install: &install matrix: *matrix git: *git composer: @@ -32,19 +32,25 @@ prepare_shop: } } +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install install_shop: matrix: *matrix git: *git +install_shop: + matrix: *matrix + git: *git + +install_shop_with_modules: *install + install_module: matrix: *matrix git: module: ref: *default_ref composer: *composer - -install_shop_with_modules: - matrix: *matrix +# END Deprecated runscript: matrix: *matrix_slim diff --git a/.github/oxid-esales/defaults/7.1.x.yml b/.github/oxid-esales/defaults/7.1.x.yml index 18b9b1fc..e0b10bcb 100644 --- a/.github/oxid-esales/defaults/7.1.x.yml +++ b/.github/oxid-esales/defaults/7.1.x.yml @@ -13,7 +13,7 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.1.x -prepare_shop: +install: &install matrix: *matrix git: *git composer: @@ -32,19 +32,25 @@ prepare_shop: } } +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install install_shop: matrix: *matrix git: *git +install_shop: + matrix: *matrix + git: *git + +install_shop_with_modules: *install + install_module: matrix: *matrix git: module: ref: *default_ref composer: *composer - -install_shop_with_modules: - matrix: *matrix +# END Deprecated runscript: matrix: *matrix_slim diff --git a/.github/oxid-esales/defaults/7.2.x.yaml b/.github/oxid-esales/defaults/7.2.x.yaml index 92be9b24..8b258c06 100644 --- a/.github/oxid-esales/defaults/7.2.x.yaml +++ b/.github/oxid-esales/defaults/7.2.x.yaml @@ -14,7 +14,7 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.2.x -prepare_shop: +install: &install matrix: *matrix git: *git composer: @@ -33,19 +33,25 @@ prepare_shop: } } +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install install_shop: matrix: *matrix git: *git +install_shop: + matrix: *matrix + git: *git + +install_shop_with_modules: *install + install_module: matrix: *matrix git: module: ref: *default_ref composer: *composer - -install_shop_with_modules: - matrix: *matrix +# END Deprecated runscript: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.2.x.yml b/.github/oxid-esales/defaults/7.2.x.yml index 92be9b24..8b258c06 100644 --- a/.github/oxid-esales/defaults/7.2.x.yml +++ b/.github/oxid-esales/defaults/7.2.x.yml @@ -14,7 +14,7 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.2.x -prepare_shop: +install: &install matrix: *matrix git: *git composer: @@ -33,19 +33,25 @@ prepare_shop: } } +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install install_shop: matrix: *matrix git: *git +install_shop: + matrix: *matrix + git: *git + +install_shop_with_modules: *install + install_module: matrix: *matrix git: module: ref: *default_ref composer: *composer - -install_shop_with_modules: - matrix: *matrix +# END Deprecated runscript: matrix: *matrix diff --git a/.github/oxid-esales/defaults/ee.yaml b/.github/oxid-esales/defaults/ee.yaml index d68738c0..2c8a0ed8 100644 --- a/.github/oxid-esales/defaults/ee.yaml +++ b/.github/oxid-esales/defaults/ee.yaml @@ -17,7 +17,7 @@ global: enterprise_ref: '{{ .Github.RefName }}' # See docs/actions/prepare_shop.md for more information. -prepare_shop: +install: &install composer: transform: | { @@ -68,6 +68,12 @@ prepare_shop: # Needs to be here as $shop_type is different prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install +install_shop: + matrix: *matrix + git: *git + # See docs/actions/start_shop.md and docs/actions/install_shop.md for more information. install_shop: git: *git @@ -75,12 +81,15 @@ install_shop: cache: prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +install_shop_with_modules: *install + install_module: cache: # Need to set this as we don't install a module. When installing a module: # 'moduleInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' prefix: *install_shop_prefix load_shop: *install_shop_prefix +# END Deprecated phpunit: load_shop: *install_shop_prefix diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml index d68738c0..2c8a0ed8 100644 --- a/.github/oxid-esales/defaults/ee.yml +++ b/.github/oxid-esales/defaults/ee.yml @@ -17,7 +17,7 @@ global: enterprise_ref: '{{ .Github.RefName }}' # See docs/actions/prepare_shop.md for more information. -prepare_shop: +install: &install composer: transform: | { @@ -68,6 +68,12 @@ prepare_shop: # Needs to be here as $shop_type is different prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install +install_shop: + matrix: *matrix + git: *git + # See docs/actions/start_shop.md and docs/actions/install_shop.md for more information. install_shop: git: *git @@ -75,12 +81,15 @@ install_shop: cache: prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +install_shop_with_modules: *install + install_module: cache: # Need to set this as we don't install a module. When installing a module: # 'moduleInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' prefix: *install_shop_prefix load_shop: *install_shop_prefix +# END Deprecated phpunit: load_shop: *install_shop_prefix diff --git a/.github/oxid-esales/defaults/pe.yaml b/.github/oxid-esales/defaults/pe.yaml index 8f4a1314..c1d133fe 100644 --- a/.github/oxid-esales/defaults/pe.yaml +++ b/.github/oxid-esales/defaults/pe.yaml @@ -17,7 +17,7 @@ global: enterprise_ref: '{{ .Github.RefName }}' # See docs/actions/prepare_shop.md for more information. -prepare_shop: +install: &install composer: transform: | { @@ -58,6 +58,9 @@ prepare_shop: # Needs to be here as $shop_type is different prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install + # See docs/actions/start_shop.md and docs/actions/install_shop.md for more information. install_shop: git: *git @@ -65,12 +68,15 @@ install_shop: cache: prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +install_shop_with_modules: *install + install_module: cache: # Need to set this as we don't install a module. When installing a module: # 'moduleInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' prefix: *install_shop_prefix load_shop: *install_shop_prefix +# END Deprecated phpunit: load_shop: *install_shop_prefix diff --git a/.github/oxid-esales/defaults/pe.yml b/.github/oxid-esales/defaults/pe.yml index 8f4a1314..c1d133fe 100644 --- a/.github/oxid-esales/defaults/pe.yml +++ b/.github/oxid-esales/defaults/pe.yml @@ -17,7 +17,7 @@ global: enterprise_ref: '{{ .Github.RefName }}' # See docs/actions/prepare_shop.md for more information. -prepare_shop: +install: &install composer: transform: | { @@ -58,6 +58,9 @@ prepare_shop: # Needs to be here as $shop_type is different prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +# BEGIN Deprecated, will be superseded by install: +prepare_shop: *install + # See docs/actions/start_shop.md and docs/actions/install_shop.md for more information. install_shop: git: *git @@ -65,12 +68,15 @@ install_shop: cache: prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' +install_shop_with_modules: *install + install_module: cache: # Need to set this as we don't install a module. When installing a module: # 'moduleInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}' prefix: *install_shop_prefix load_shop: *install_shop_prefix +# END Deprecated phpunit: load_shop: *install_shop_prefix diff --git a/.github/oxid-esales/defaults/scheduled.yaml b/.github/oxid-esales/defaults/scheduled.yaml index f0dad11d..75559c18 100644 --- a/.github/oxid-esales/defaults/scheduled.yaml +++ b/.github/oxid-esales/defaults/scheduled.yaml @@ -5,10 +5,13 @@ global: title: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}' -prepare_shop: +install: &install git: shop_ref: '{{ .Data.global.git.default_ref }}' +prepare_shop: *install +install_shop_with_modules: *install + sonarcloud: target_branch: '{{ .Data.global.git.default_ref }}' diff --git a/.github/oxid-esales/defaults/scheduled.yml b/.github/oxid-esales/defaults/scheduled.yml index f0dad11d..75559c18 100644 --- a/.github/oxid-esales/defaults/scheduled.yml +++ b/.github/oxid-esales/defaults/scheduled.yml @@ -5,10 +5,13 @@ global: title: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}' -prepare_shop: +install: &install git: shop_ref: '{{ .Data.global.git.default_ref }}' +prepare_shop: *install +install_shop_with_modules: *install + sonarcloud: target_branch: '{{ .Data.global.git.default_ref }}' From 82f2dce350671653915cac6f5b1f1625fd0fceaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 12:07:39 +0200 Subject: [PATCH 06/10] Add echo to indicate which shop is cloned --- prepare_shop/action.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prepare_shop/action.yaml b/prepare_shop/action.yaml index c517f044..8a6b4bae 100644 --- a/prepare_shop/action.yaml +++ b/prepare_shop/action.yaml @@ -264,6 +264,7 @@ runs: echo "::warning file=${{ github.workflow_ref}},title=Deprecation warning::git_shop_url is deprecated, switch to git_repository" REF='${{ inputs.git_shop_ref }}' fi + echo -e "\033[0;35m### Cloning ${REF} ###\033[0m" git clone --depth 2 "${URL}" --branch "${REF}" --single-branch source - name: Clone the shop (PR ${{ inputs.github_event_number }}) @@ -289,6 +290,7 @@ runs: URL="https://oxidci:${{ inputs.enterprise_github_token }}@github.com/${REPO}" fi fi + echo -e "\033[0;35m### Cloning ${{ inputs.github_base_ref }} and merging head:pr_${{ inputs.github_event_number }} ###\033[0m" git clone --depth 2 "${URL}" --branch ${{ inputs.github_base_ref }} --single-branch source git -C source fetch origin refs/pull/${{ inputs.github_event_number }}/head:pr_${{ inputs.github_event_number }} git -C source checkout pr_${{ inputs.github_event_number }} @@ -303,6 +305,7 @@ runs: AUTH="oxidci:${{ inputs.enterprise_github_token || github.token }}" echo -e "\033[0;35mHandling the pull request for the EE shop\033[0m" mkdir -p source/dev-packages + echo -e "\033[0;35m### Cloning ${{ inputs.github_base_ref }} and merging head:pr_${{ inputs.github_event_number }} ###\033[0m" git clone --depth 2 \ https://${AUTH}@github.com/OXID-eSales/oxideshop_ee.git \ --branch ${{ inputs.github_base_ref }} \ From a486b379b4389988916ccbc085bfa6c9605786aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 12:11:02 +0200 Subject: [PATCH 07/10] lint --- .github/oxid-esales/defaults/7.0.x.yaml | 3 -- .github/oxid-esales/defaults/7.0.x.yml | 3 -- .github/oxid-esales/defaults/7.1.x.yaml | 3 -- .github/oxid-esales/defaults/7.1.x.yml | 3 -- .github/oxid-esales/defaults/7.2.x.yaml | 3 -- .github/oxid-esales/defaults/7.2.x.yml | 3 -- .github/oxid-esales/defaults/ee.yaml | 3 -- .github/oxid-esales/defaults/ee.yml | 3 -- .../workflows/universal_workflow_light.yml | 33 ++++++++++++------- 9 files changed, 21 insertions(+), 36 deletions(-) diff --git a/.github/oxid-esales/defaults/7.0.x.yaml b/.github/oxid-esales/defaults/7.0.x.yaml index aadb4c88..260f3642 100644 --- a/.github/oxid-esales/defaults/7.0.x.yaml +++ b/.github/oxid-esales/defaults/7.0.x.yaml @@ -34,9 +34,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.0.x.yml b/.github/oxid-esales/defaults/7.0.x.yml index aadb4c88..260f3642 100644 --- a/.github/oxid-esales/defaults/7.0.x.yml +++ b/.github/oxid-esales/defaults/7.0.x.yml @@ -34,9 +34,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.1.x.yaml b/.github/oxid-esales/defaults/7.1.x.yaml index e0b10bcb..e589fc1e 100644 --- a/.github/oxid-esales/defaults/7.1.x.yaml +++ b/.github/oxid-esales/defaults/7.1.x.yaml @@ -34,9 +34,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.1.x.yml b/.github/oxid-esales/defaults/7.1.x.yml index e0b10bcb..e589fc1e 100644 --- a/.github/oxid-esales/defaults/7.1.x.yml +++ b/.github/oxid-esales/defaults/7.1.x.yml @@ -34,9 +34,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.2.x.yaml b/.github/oxid-esales/defaults/7.2.x.yaml index 8b258c06..0cbecef5 100644 --- a/.github/oxid-esales/defaults/7.2.x.yaml +++ b/.github/oxid-esales/defaults/7.2.x.yaml @@ -35,9 +35,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/7.2.x.yml b/.github/oxid-esales/defaults/7.2.x.yml index 8b258c06..0cbecef5 100644 --- a/.github/oxid-esales/defaults/7.2.x.yml +++ b/.github/oxid-esales/defaults/7.2.x.yml @@ -35,9 +35,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git install_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/ee.yaml b/.github/oxid-esales/defaults/ee.yaml index 2c8a0ed8..1ba5a132 100644 --- a/.github/oxid-esales/defaults/ee.yaml +++ b/.github/oxid-esales/defaults/ee.yaml @@ -70,9 +70,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git # See docs/actions/start_shop.md and docs/actions/install_shop.md for more information. install_shop: diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml index 2c8a0ed8..1ba5a132 100644 --- a/.github/oxid-esales/defaults/ee.yml +++ b/.github/oxid-esales/defaults/ee.yml @@ -70,9 +70,6 @@ install: &install # BEGIN Deprecated, will be superseded by install: prepare_shop: *install -install_shop: - matrix: *matrix - git: *git # See docs/actions/start_shop.md and docs/actions/install_shop.md for more information. install_shop: diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index c6a5beae..791b4f6e 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -551,18 +551,6 @@ jobs: config_idebug: ${{ steps.iltp.outputs.install_config_idebug }} debug: ${{ needs.init.outputs.debug }} - - name: 'Install shop (script)' - if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} - run: | - SCRIPT="${{ steps.iltp.outputs.install_script }}" - if [ -f "${SCRIPT}" ]; then - chmod a+x "${SCRIPT}" - "${SCRIPT}" - else - echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" - exit 1 - fi - - name: 'Debug Install shop (script)' if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} run: | @@ -584,11 +572,32 @@ jobs: echo -e "\033[0;31mCould not find ${SCRIPT}\033[0m" exit 1 fi + if [ -s data/php/logs/error_log.txt ]; then + echo -e "\033[0;35mPHP error log\033[0m" + cat data/php/logs/error_log.txt + fi EOF + - name: 'Install shop (script)' + if: ${{ steps.iltp.outputs.install_method == 'script' && steps.iltp.outputs.install_skip_shop_installation == 'false' }} + run: | + SCRIPT="${{ steps.iltp.outputs.install_script }}" + if [ -f "${SCRIPT}" ]; then + chmod a+x "${SCRIPT}" + "${SCRIPT}" + else + echo -e "\033[0;31mCould not finds ${SCRIPT}\033[0m" + exit 1 + fi + if [ -s data/php/logs/error_log.txt ]; then + echo -e "\033[0;35mPHP error log\033[0m" + cat data/php/logs/error_log.txt + fi + - name: Activate modules shell: bash run: | + # Activate modules ${{ needs.init.outputs.debug }} if [ -f 'source/bin/oe-console' ]; then OE_CONSOLE='bin/oe-console' From 3b7e82c5c95de13110e0ae433a1d0586983b1294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 12:48:22 +0200 Subject: [PATCH 08/10] Overwrite more default variables in version templates --- .github/oxid-esales/defaults/7.0.x.yaml | 2 ++ .github/oxid-esales/defaults/7.0.x.yml | 2 ++ .github/oxid-esales/defaults/7.1.x.yaml | 3 ++- .github/oxid-esales/defaults/7.1.x.yml | 3 ++- .github/oxid-esales/defaults/7.2.x.yaml | 3 ++- .github/oxid-esales/defaults/7.2.x.yml | 3 ++- .github/oxid-esales/defaults/scheduled.yaml | 11 +++++++++-- .github/oxid-esales/defaults/scheduled.yml | 11 +++++++++-- 8 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/oxid-esales/defaults/7.0.x.yaml b/.github/oxid-esales/defaults/7.0.x.yaml index 260f3642..676b5a68 100644 --- a/.github/oxid-esales/defaults/7.0.x.yaml +++ b/.github/oxid-esales/defaults/7.0.x.yaml @@ -9,6 +9,8 @@ workflow: global: git: &git default_ref: &default_ref 'b-7.0.x' + safe_ref_name: 'b-7.0.x' + enterprise_ref: 'b-7.0.x' composer: &composer dev_ref: &dev_ref dev-b-7.0.x diff --git a/.github/oxid-esales/defaults/7.0.x.yml b/.github/oxid-esales/defaults/7.0.x.yml index 260f3642..676b5a68 100644 --- a/.github/oxid-esales/defaults/7.0.x.yml +++ b/.github/oxid-esales/defaults/7.0.x.yml @@ -9,6 +9,8 @@ workflow: global: git: &git default_ref: &default_ref 'b-7.0.x' + safe_ref_name: 'b-7.0.x' + enterprise_ref: 'b-7.0.x' composer: &composer dev_ref: &dev_ref dev-b-7.0.x diff --git a/.github/oxid-esales/defaults/7.1.x.yaml b/.github/oxid-esales/defaults/7.1.x.yaml index e589fc1e..6e320c34 100644 --- a/.github/oxid-esales/defaults/7.1.x.yaml +++ b/.github/oxid-esales/defaults/7.1.x.yaml @@ -8,7 +8,8 @@ workflow: global: git: &git default_ref: &default_ref 'b-7.1.x' - + safe_ref_name: 'b-7.1.x' + enterprise_ref: 'b-7.1.x' composer: &composer dev_ref: &dev_ref dev-b-7.1.x diff --git a/.github/oxid-esales/defaults/7.1.x.yml b/.github/oxid-esales/defaults/7.1.x.yml index e589fc1e..6e320c34 100644 --- a/.github/oxid-esales/defaults/7.1.x.yml +++ b/.github/oxid-esales/defaults/7.1.x.yml @@ -8,7 +8,8 @@ workflow: global: git: &git default_ref: &default_ref 'b-7.1.x' - + safe_ref_name: 'b-7.1.x' + enterprise_ref: 'b-7.1.x' composer: &composer dev_ref: &dev_ref dev-b-7.1.x diff --git a/.github/oxid-esales/defaults/7.2.x.yaml b/.github/oxid-esales/defaults/7.2.x.yaml index 0cbecef5..331ddf34 100644 --- a/.github/oxid-esales/defaults/7.2.x.yaml +++ b/.github/oxid-esales/defaults/7.2.x.yaml @@ -9,7 +9,8 @@ workflow: global: git: &git default_ref: &default_ref 'b-7.2.x' - + safe_ref_name: 'b-7.2.x' + enterprise_ref: 'b-7.2.x' composer: &composer dev_ref: &dev_ref dev-b-7.2.x diff --git a/.github/oxid-esales/defaults/7.2.x.yml b/.github/oxid-esales/defaults/7.2.x.yml index 0cbecef5..331ddf34 100644 --- a/.github/oxid-esales/defaults/7.2.x.yml +++ b/.github/oxid-esales/defaults/7.2.x.yml @@ -9,7 +9,8 @@ workflow: global: git: &git default_ref: &default_ref 'b-7.2.x' - + safe_ref_name: 'b-7.2.x' + enterprise_ref: 'b-7.2.x' composer: &composer dev_ref: &dev_ref dev-b-7.2.x diff --git a/.github/oxid-esales/defaults/scheduled.yaml b/.github/oxid-esales/defaults/scheduled.yaml index 75559c18..453696e0 100644 --- a/.github/oxid-esales/defaults/scheduled.yaml +++ b/.github/oxid-esales/defaults/scheduled.yaml @@ -4,12 +4,19 @@ global: title: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}' + git: &git + shop_ref: '{{ .Data.global.git.default_ref }}' + ref: '{{ .Data.global.git.default_ref }}' + enterprise_ref: '{{ .Data.global.git.default_ref }}' + composer: &composer + ref_name: 'dev-{{ .Data.global.git.default_ref }}' install: &install - git: - shop_ref: '{{ .Data.global.git.default_ref }}' + git: *git + composer: *composer prepare_shop: *install + install_shop_with_modules: *install sonarcloud: diff --git a/.github/oxid-esales/defaults/scheduled.yml b/.github/oxid-esales/defaults/scheduled.yml index 75559c18..453696e0 100644 --- a/.github/oxid-esales/defaults/scheduled.yml +++ b/.github/oxid-esales/defaults/scheduled.yml @@ -4,12 +4,19 @@ global: title: '{{ .Github.EventName }}-{{ .Data.global.git.default_ref }}' + git: &git + shop_ref: '{{ .Data.global.git.default_ref }}' + ref: '{{ .Data.global.git.default_ref }}' + enterprise_ref: '{{ .Data.global.git.default_ref }}' + composer: &composer + ref_name: 'dev-{{ .Data.global.git.default_ref }}' install: &install - git: - shop_ref: '{{ .Data.global.git.default_ref }}' + git: *git + composer: *composer prepare_shop: *install + install_shop_with_modules: *install sonarcloud: From a7d1d8d5bb2d7d6f9b3c22d6cace7a8d2e3404a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 1 Jul 2024 12:51:01 +0200 Subject: [PATCH 09/10] Cleanup merge --- .github/oxid-esales/defaults/scheduled.yaml | 3 --- .github/oxid-esales/defaults/scheduled.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/oxid-esales/defaults/scheduled.yaml b/.github/oxid-esales/defaults/scheduled.yaml index 66655bde..453696e0 100644 --- a/.github/oxid-esales/defaults/scheduled.yaml +++ b/.github/oxid-esales/defaults/scheduled.yaml @@ -19,9 +19,6 @@ prepare_shop: *install install_shop_with_modules: *install -prepare_shop: *install -install_shop_with_modules: *install - sonarcloud: target_branch: '{{ .Data.global.git.default_ref }}' diff --git a/.github/oxid-esales/defaults/scheduled.yml b/.github/oxid-esales/defaults/scheduled.yml index 66655bde..453696e0 100644 --- a/.github/oxid-esales/defaults/scheduled.yml +++ b/.github/oxid-esales/defaults/scheduled.yml @@ -19,9 +19,6 @@ prepare_shop: *install install_shop_with_modules: *install -prepare_shop: *install -install_shop_with_modules: *install - sonarcloud: target_branch: '{{ .Data.global.git.default_ref }}' From 8f06bda604b7e0d79f131172b4df5a1ebb376c57 Mon Sep 17 00:00:00 2001 From: joernott Date: Mon, 1 Jul 2024 10:53:35 +0000 Subject: [PATCH 10/10] Update versions --- .github/workflows/universal_workflow_light.yaml | 14 +++++++------- .github/workflows/universal_workflow_light.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml index 791b4f6e..40ab788f 100644 --- a/.github/workflows/universal_workflow_light.yaml +++ b/.github/workflows/universal_workflow_light.yaml @@ -496,7 +496,7 @@ jobs: - name: 'Stop shop for preparedShop cache' if: ${{ steps.iltp.outputs.install_cache_prepared_shop == 'true' }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} @@ -657,7 +657,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} @@ -859,7 +859,7 @@ jobs: token: ${{ github.token }} - name: 'Run runscript check' - uses: 'OXID-eSales/github-actions/run_test_script@v0' + uses: 'OXID-eSales/github-actions/run_test_script@v4' with: script: ${{ steps.rt.outputs.runscript_script }} path: ${{ steps.rt.outputs.runscript_path }} @@ -881,13 +881,13 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} - name: 'Write Report' if: always() - uses: OXID-eSales/github-actions/append_report@v0 + uses: OXID-eSales/github-actions/append_report@v4 with: prefix: '${{ needs.init.outputs.global_title }}' priority: '100' @@ -1042,7 +1042,7 @@ jobs: debug: ${{ needs.init.outputs.debug }} - name: 'Run runslim check' - uses: 'OXID-eSales/github-actions/run_test_script@v0' + uses: 'OXID-eSales/github-actions/run_test_script@v4' with: script: ${{ steps.rt.outputs.runslim_script }} path: ${{ steps.rt.outputs.runslim_path }} @@ -1064,7 +1064,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml index 791b4f6e..40ab788f 100644 --- a/.github/workflows/universal_workflow_light.yml +++ b/.github/workflows/universal_workflow_light.yml @@ -496,7 +496,7 @@ jobs: - name: 'Stop shop for preparedShop cache' if: ${{ steps.iltp.outputs.install_cache_prepared_shop == 'true' }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} @@ -657,7 +657,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} @@ -859,7 +859,7 @@ jobs: token: ${{ github.token }} - name: 'Run runscript check' - uses: 'OXID-eSales/github-actions/run_test_script@v0' + uses: 'OXID-eSales/github-actions/run_test_script@v4' with: script: ${{ steps.rt.outputs.runscript_script }} path: ${{ steps.rt.outputs.runscript_path }} @@ -881,13 +881,13 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }} - name: 'Write Report' if: always() - uses: OXID-eSales/github-actions/append_report@v0 + uses: OXID-eSales/github-actions/append_report@v4 with: prefix: '${{ needs.init.outputs.global_title }}' priority: '100' @@ -1042,7 +1042,7 @@ jobs: debug: ${{ needs.init.outputs.debug }} - name: 'Run runslim check' - uses: 'OXID-eSales/github-actions/run_test_script@v0' + uses: 'OXID-eSales/github-actions/run_test_script@v4' with: script: ${{ steps.rt.outputs.runslim_script }} path: ${{ steps.rt.outputs.runslim_path }} @@ -1064,7 +1064,7 @@ jobs: - name: 'Stop shop' if: ${{ always() }} - uses: 'OXID-eSales/github-actions/stop_shop@v0' + uses: 'OXID-eSales/github-actions/stop_shop@v4' with: debug: ${{ needs.init.outputs.debug }}