From 0236d1a73d7938a71d5e19cf990ad644f0a10835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Fri, 26 Jul 2024 11:24:06 +0200 Subject: [PATCH] Fix PE/EE template referencing the wrong branch for nightlies --- .github/oxid-esales/defaults/ee.yaml | 26 +++++++++++++------------- .github/oxid-esales/defaults/ee.yml | 26 +++++++++++++------------- .github/oxid-esales/defaults/pe.yaml | 20 ++++++++++---------- .github/oxid-esales/defaults/pe.yml | 20 ++++++++++---------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/oxid-esales/defaults/ee.yaml b/.github/oxid-esales/defaults/ee.yaml index 45223ae2..8b34942a 100644 --- a/.github/oxid-esales/defaults/ee.yaml +++ b/.github/oxid-esales/defaults/ee.yaml @@ -30,17 +30,17 @@ install_shop_with_modules: &install "ddoe/*": "source" }, "require": { - "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.dev_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 }}", - "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component-ee": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}" }, "require-dev": { - "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}" }, "repositories": { "oxid-esales/twig-component-ee": { @@ -118,10 +118,10 @@ runtest: transform: | { "require-dev": { - "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.dev_ref }}", + "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.ref_name }}", "codeception/module-webdriver": "^3.1", "phpunit/phpunit": "^9.1.1" }, diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml index 45223ae2..8b34942a 100644 --- a/.github/oxid-esales/defaults/ee.yml +++ b/.github/oxid-esales/defaults/ee.yml @@ -30,17 +30,17 @@ install_shop_with_modules: &install "ddoe/*": "source" }, "require": { - "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.dev_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 }}", - "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component-ee": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}" }, "require-dev": { - "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}" }, "repositories": { "oxid-esales/twig-component-ee": { @@ -118,10 +118,10 @@ runtest: transform: | { "require-dev": { - "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.dev_ref }}", + "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.ref_name }}", "codeception/module-webdriver": "^3.1", "phpunit/phpunit": "^9.1.1" }, diff --git a/.github/oxid-esales/defaults/pe.yaml b/.github/oxid-esales/defaults/pe.yaml index f84ec845..8f90ca94 100644 --- a/.github/oxid-esales/defaults/pe.yaml +++ b/.github/oxid-esales/defaults/pe.yaml @@ -30,15 +30,15 @@ install_shop_with_modules: &install "ddoe/*": "source" }, "require": { - "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_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 }}", - "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}" }, "require-dev": { - "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}" }, "repositories": { "oxid-esales/twig-component-pe": { @@ -108,9 +108,9 @@ runtest: transform: | { "require-dev": { - "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}", + "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}", "codeception/module-webdriver": "^3.1", "phpunit/phpunit": "^9.1.1" }, diff --git a/.github/oxid-esales/defaults/pe.yml b/.github/oxid-esales/defaults/pe.yml index f84ec845..8f90ca94 100644 --- a/.github/oxid-esales/defaults/pe.yml +++ b/.github/oxid-esales/defaults/pe.yml @@ -30,15 +30,15 @@ install_shop_with_modules: &install "ddoe/*": "source" }, "require": { - "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_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 }}", - "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}" }, "require-dev": { - "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}" + "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}" }, "repositories": { "oxid-esales/twig-component-pe": { @@ -108,9 +108,9 @@ runtest: transform: | { "require-dev": { - "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}", - "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}", + "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}", + "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}", "codeception/module-webdriver": "^3.1", "phpunit/phpunit": "^9.1.1" },