From 5ba0f27b26e08de484ea1ef8fb770e9af6acf8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 4 Mar 2024 13:57:18 +0100 Subject: [PATCH 1/4] Cleanup deprecated options, fix EE and PE templates and limit title in generate_report --- .github/oxid-esales/defaults/7.0.x.yml | 6 ------ .github/oxid-esales/defaults/7.1.x.yml | 5 ----- .github/oxid-esales/defaults/ee.yml | 14 +------------- .github/oxid-esales/defaults/pe.yml | 13 +------------ generate_report/action.yml | 3 ++- 5 files changed, 4 insertions(+), 37 deletions(-) diff --git a/.github/oxid-esales/defaults/7.0.x.yml b/.github/oxid-esales/defaults/7.0.x.yml index 5c77b66b..c4fc4707 100644 --- a/.github/oxid-esales/defaults/7.0.x.yml +++ b/.github/oxid-esales/defaults/7.0.x.yml @@ -11,12 +11,6 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.0.x - # Configure/Require are deprecated - configure: - ref: *dev_ref - require: - ref: *dev_ref - prepare_shop: matrix: *matrix git: *git diff --git a/.github/oxid-esales/defaults/7.1.x.yml b/.github/oxid-esales/defaults/7.1.x.yml index 7c04062f..3f1a8ad5 100644 --- a/.github/oxid-esales/defaults/7.1.x.yml +++ b/.github/oxid-esales/defaults/7.1.x.yml @@ -11,11 +11,6 @@ global: composer: &composer dev_ref: &dev_ref dev-b-7.1.x - # Configure/Require are deprecated - configure: - ref: *dev_ref - require: - ref: *dev_ref prepare_shop: matrix: *matrix diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml index 8258a94e..f507df4c 100644 --- a/.github/oxid-esales/defaults/ee.yml +++ b/.github/oxid-esales/defaults/ee.yml @@ -16,14 +16,6 @@ global: shop_ref: &git_shop_ref '{{ .Data.global.git.default_ref }}' enterprise_ref: '{{ .Github.RefName }}' - # only configure/install is different - composer: &composer - configure: &composer_configure - install: '' - require: &composer_require - transform: '' - - # See docs/actions/prepare_shop.md for more information. prepare_shop: composer: @@ -34,7 +26,7 @@ prepare_shop: }, "require": { "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/oxideshop-ee": "dev-{{ .Github.RefName }}", + "oxid-esales/oxideshop-ee": "dev-{{ .Data.prepare_shop.git.shop_ref }}", "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}", "oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}", "oxid-esales/twig-component-ee": "{{ .Data.global.composer.dev_ref }}", @@ -91,7 +83,6 @@ codeception: container: options: '-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome -e THEME_ID=apex' method: &selenium_container_method 'run' - composer: *composer configuration: 'vendor/oxid-esales/oxideshop-ee/Tests/codeception.yml' additional_options: '' output: @@ -111,9 +102,6 @@ runtest: container: options: '-e ACTIVE_THEME=apex' method: 'run' - composer: - configure: *composer_configure - require: *composer_require file: 'source/composer.json' backup: true transform: | diff --git a/.github/oxid-esales/defaults/pe.yml b/.github/oxid-esales/defaults/pe.yml index 9d820830..122975f8 100644 --- a/.github/oxid-esales/defaults/pe.yml +++ b/.github/oxid-esales/defaults/pe.yml @@ -16,14 +16,6 @@ global: shop_ref: &git_shop_ref '{{ .Data.global.git.default_ref }}' enterprise_ref: '{{ .Github.RefName }}' - # only configure/install is different - composer: &composer - configure: &composer_configure - install: '' - require: &composer_require - transform: '' - - # See docs/actions/prepare_shop.md for more information. prepare_shop: composer: @@ -33,7 +25,7 @@ prepare_shop: "github-protocols": ["https"] }, "require": { - "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}", + "oxid-esales/oxideshop-pe": "dev-{{ .Data.prepare_shop.git.shop_ref }}", "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}", "oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}", "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}", @@ -81,7 +73,6 @@ codeception: container: options: '-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome -e THEME_ID=apex' method: &selenium_container_method 'run' - composer: *composer configuration: 'vendor/oxid-esales/oxideshop-pe/Tests/codeception.yml' additional_options: '' output: @@ -102,8 +93,6 @@ runtest: options: '-e ACTIVE_THEME=apex' method: 'run' composer: - configure: *composer_configure - require: *composer_require file: 'source/composer.json' backup: true transform: | diff --git a/generate_report/action.yml b/generate_report/action.yml index ae733345..ae63685c 100644 --- a/generate_report/action.yml +++ b/generate_report/action.yml @@ -112,6 +112,7 @@ runs: fi cat "${FILE}" >>"slack_report-${GROUP}.md" done + TITLE='${{inputs.title}} ${{ steps.process_slack.outputs.overall_status}}' cat >slack.json < Date: Mon, 4 Mar 2024 14:09:50 +0100 Subject: [PATCH 2/4] Fix branch Regex for prepare_shop composer feature-branch handling --- prepare_shop/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare_shop/action.yml b/prepare_shop/action.yml index c4639a21..fa7262eb 100644 --- a/prepare_shop/action.yml +++ b/prepare_shop/action.yml @@ -262,7 +262,7 @@ runs: # prepare_shop: Modify composer.json to allow the same feature-branch ${{ inputs.debug }} if [ -f '${{ inputs.composer_file }}' ]; then - BASE_BRANCH_PATTERN='^b-[0-9]+\.[0-9}+\.x$' + BASE_BRANCH_PATTERN='^b-[0-9]+\.[0-9]+\.x$' if [[ '${{ inputs.github_ref_name }}' =~ $BASE_BRANCH_PATTERN ]]; then echo -e "\033[0;35mNot modifying composer.json because ${{ inputs.github_ref_name }} is a base branch\033[0m" else From 1c2ed758956d01041903703092851301ec404833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 4 Mar 2024 14:39:08 +0100 Subject: [PATCH 3/4] Fix codeception composer transformation --- .github/oxid-esales/defaults/defaults.yml | 1 + .github/workflows/call-universal_test_workflow.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/oxid-esales/defaults/defaults.yml b/.github/oxid-esales/defaults/defaults.yml index 10e24989..9fef82df 100644 --- a/.github/oxid-esales/defaults/defaults.yml +++ b/.github/oxid-esales/defaults/defaults.yml @@ -324,6 +324,7 @@ phpunit: load_shop: *install_module_prefix container: *container cache: *cache + composer: *composer # Run custom script outside the container' custom_script: '' diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml index 82c01a47..29a3af24 100644 --- a/.github/workflows/call-universal_test_workflow.yml +++ b/.github/workflows/call-universal_test_workflow.yml @@ -817,7 +817,7 @@ jobs: if: ${{ steps.codeception_testplan.outputs.codeception_composer_transform != '' }} uses: 'OXID-eSales/github-actions/composer_merge@v4' with: - file: '${{ steps.codeception_testplan.outputs.codeception_composer_path }}' + file: '${{ steps.codeception_testplan.outputs.codeception_composer_file }}' backup: true transform: | ${{ steps.codeception_testplan.outputs.codeception_composer_transform }} From 506955d1662e1980d52edf14392f92881ae8fcaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Mon, 4 Mar 2024 15:33:41 +0100 Subject: [PATCH 4/4] Fix ee/pe templates --- .github/oxid-esales/defaults/ee.yml | 5 +---- .github/oxid-esales/defaults/pe.yml | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml index f507df4c..d8d3248d 100644 --- a/.github/oxid-esales/defaults/ee.yml +++ b/.github/oxid-esales/defaults/ee.yml @@ -102,8 +102,7 @@ runtest: container: options: '-e ACTIVE_THEME=apex' method: 'run' - file: 'source/composer.json' - backup: true + composer: transform: | { "require-dev": { @@ -125,8 +124,6 @@ runtest: } } } - update: true - update_options: '--no-interaction' # yamllint disable-line rule:line-length additional_options: '--filter "/^((?!(testFrontendVAT)).)*$/" --exclude-group quarantine,varnish,paypal_buyerlogin,paypal_external,paypal_graphql,adminFunctionality,flow_theme' coverage: diff --git a/.github/oxid-esales/defaults/pe.yml b/.github/oxid-esales/defaults/pe.yml index 122975f8..d473cc88 100644 --- a/.github/oxid-esales/defaults/pe.yml +++ b/.github/oxid-esales/defaults/pe.yml @@ -93,8 +93,6 @@ runtest: options: '-e ACTIVE_THEME=apex' method: 'run' composer: - file: 'source/composer.json' - backup: true transform: | { "require-dev": { @@ -110,8 +108,6 @@ runtest: } } } - update: true - update_options: '--no-interaction' # yamllint disable-line rule:line-length additional_options: '--filter "/^((?!(testFrontendVAT)).)*$/" --exclude-group quarantine,varnish,paypal_buyerlogin,paypal_external,paypal_graphql,adminFunctionality,flow_theme' coverage: