Skip to content

Commit 499e64a

Browse files
tkcreateittkcreateit
committed
OXDEV-8819 Upgrade GHA workflow to v5 and extend matrix
1 parent fe8f75f commit 499e64a

9 files changed

Lines changed: 154 additions & 180 deletions

File tree

‎.github/oxid-esales/module-security-ce.yaml‎

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,24 @@
66
install:
77
cache:
88
prepared_shop: false
9-
git:
10-
repository: '{{ $repo }}'
11-
ref: &ref '{{ .Github.RefName }}'
12-
shop_url: 'https://github.com/OXID-eSales/security-module.git'
13-
shop_ref: *ref
14-
composer:
15-
root_url: ''
16-
transform: |
17-
{
18-
"require-dev": {
19-
"oxid-esales/oxideshop-ce": "{{ .Data.global.composer.dev_ref }}",
20-
"oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
21-
"oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
22-
"oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
23-
"oxid-esales/developer-tools": "{{ .Data.global.composer.dev_ref }}",
24-
"oxid-esales/security-module": "dev-{{ .Github.RefName }}"
25-
},
26-
"config": {
27-
"allow-plugins": {
28-
"oxid-esales/oxideshop-composer-plugin": true,
29-
"oxid-esales/oxideshop-unified-namespace-generator": true
30-
}
31-
}
9+
composer:
10+
root_url: ''
11+
transform: |
12+
{
13+
"require-dev": {
14+
"oxid-esales/oxideshop-ce": "{{ .Data.install.composer.dev_ref }}",
15+
"oxid-esales/twig-component": "{{ .Data.install.composer.dev_ref }}",
16+
"oxid-esales/twig-admin-theme": "{{ .Data.install.composer.dev_ref }}",
17+
"oxid-esales/apex-theme": "{{ .Data.install.composer.dev_ref }}",
18+
"oxid-esales/developer-tools": "{{ .Data.install.composer.dev_ref }}"
19+
},
20+
"config": {
21+
"allow-plugins": {
22+
"oxid-esales/oxideshop-composer-plugin": true,
23+
"oxid-esales/oxideshop-unified-namespace-generator": true
24+
}
3225
}
26+
}
3327
custom_script_container: |
3428
vendor/bin/oe-console oe:database:reset --db-host=mysql --db-port=3306 --db-name=example --db-user=root --db-password=root --force
3529
vendor/bin/oe-console oe:module:install ./
@@ -38,31 +32,28 @@ install:
3832
vendor/bin/oe-console oe:module:activate oe_security_module
3933
vendor/bin/oe-console oe:theme:activate apex
4034
41-
install_shop_with_modules:
42-
composer:
43-
root_url: ''
44-
4535
runscript: &runscript
4636
matrix:
4737
script: |
4838
[
49-
"security_module:tests-unit",
50-
"security_module:tests-integration",
51-
"security_module:tests-codeception"
39+
"report:tests-unit",
40+
"report:tests-integration",
41+
"no_report:tests-codeception"
5242
]
53-
composer:
54-
early: true
55-
security_module:
43+
report:
44+
path: ''
45+
no_report:
5646
path: ''
47+
coverage_prefix: ''
5748

5849
runslim:
5950
<<: *runscript
6051
matrix:
6152
script: |
6253
[
63-
"security_module:phpcs",
64-
"security_module:phpstan",
65-
"security_module:phpmd"
54+
"no_report:phpcs",
55+
"report:phpstan-report",
56+
"no_report:phpmd"
6657
]
6758
6859
sonarcloud:
@@ -72,12 +63,12 @@ sonarcloud:
7263
project_key: 'OXID-eSales_security-module'
7364
project_name: 'oxid-esales/security-module'
7465
organization: 'oxid-esales'
75-
parameters: |
76-
-Dsonar.language=php \
77-
-Dsonar.scm.provider=git \
78-
-Dsonar.sources=src \
79-
-Dsonar.tests=tests \
66+
parameters: >
67+
-Dsonar.language=php
68+
-Dsonar.scm.provider=git
69+
-Dsonar.sources=src
70+
-Dsonar.tests=tests
8071
-Dsonar.php.phpstan.reportPaths=coverage-reports/phpstan.report.json
8172
8273
finish:
83-
slack_title: 'Security module ({{ .Data.global.git.shop_ref }}) by {{ .Github.Actor }}'
74+
slack_title: 'Security module ({{ .Data.install.git.ref }}) by {{ .Github.Actor }}'

‎.github/oxid-esales/module-security-ee.yaml‎

Lines changed: 55 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,46 @@
66
install:
77
cache:
88
prepared_shop: false
9-
git:
10-
repository: '{{ $repo }}'
11-
ref: &ref '{{ .Github.RefName }}'
12-
shop_url: 'https://github.com/OXID-eSales/security-module.git'
13-
shop_ref: *ref
14-
composer:
15-
root_url: ''
16-
transform: |
17-
{
18-
"require-dev": {
19-
"oxid-esales/oxideshop-ce": "{{ .Data.global.composer.dev_ref }}",
20-
"oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}",
21-
"oxid-esales/oxideshop-ee": "{{ .Data.global.composer.dev_ref }}",
22-
"oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
23-
"oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}",
24-
"oxid-esales/twig-component-ee": "{{ .Data.global.composer.dev_ref }}",
25-
"oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
26-
"oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
27-
"oxid-esales/developer-tools": "{{ .Data.global.composer.dev_ref }}",
28-
"oxid-esales/security-module": "dev-{{ .Github.RefName }}"
29-
},
30-
"repositories": {
31-
"oxid-esales/security-module": {
32-
"type": "git",
33-
"url": "https://github.com/OXID-eSales/security-module.git"
34-
},
35-
"oxid-esales/oxideshop-ee": {
36-
"type": "git",
37-
"url": "https://github.com/OXID-eSales/oxideshop_ee.git"
38-
},
39-
"oxid-esales/oxideshop-pe": {
40-
"type": "git",
41-
"url": "https://github.com/OXID-eSales/oxideshop_pe.git"
42-
},
43-
"oxid-esales/twig-component-pe": {
44-
"type": "git",
45-
"url": "https://github.com/OXID-eSales/twig-component-pe.git"
46-
},
47-
"oxid-esales/twig-component-ee": {
48-
"type": "git",
49-
"url": "https://github.com/OXID-eSales/twig-component-ee.git"
50-
}
51-
},
52-
"config": {
53-
"allow-plugins": {
54-
"oxid-esales/oxideshop-composer-plugin": true,
55-
"oxid-esales/oxideshop-unified-namespace-generator": true
56-
}
57-
}
9+
composer:
10+
root_url: ''
11+
transform: |
12+
{
13+
"require-dev": {
14+
"oxid-esales/oxideshop-ce": "{{ .Data.install.composer.dev_ref }}",
15+
"oxid-esales/oxideshop-pe": "{{ .Data.install.composer.dev_ref }}",
16+
"oxid-esales/oxideshop-ee": "{{ .Data.install.composer.dev_ref }}",
17+
"oxid-esales/twig-component": "{{ .Data.install.composer.dev_ref }}",
18+
"oxid-esales/twig-component-pe": "{{ .Data.install.composer.dev_ref }}",
19+
"oxid-esales/twig-component-ee": "{{ .Data.install.composer.dev_ref }}",
20+
"oxid-esales/twig-admin-theme": "{{ .Data.install.composer.dev_ref }}",
21+
"oxid-esales/apex-theme": "{{ .Data.install.composer.dev_ref }}",
22+
"oxid-esales/developer-tools": "{{ .Data.install.composer.dev_ref }}"
23+
},
24+
"repositories": {
25+
"oxid-esales/oxideshop-ee": {
26+
"type": "git",
27+
"url": "https://github.com/OXID-eSales/oxideshop_ee.git"
28+
},
29+
"oxid-esales/oxideshop-pe": {
30+
"type": "git",
31+
"url": "https://github.com/OXID-eSales/oxideshop_pe.git"
32+
},
33+
"oxid-esales/twig-component-pe": {
34+
"type": "git",
35+
"url": "https://github.com/OXID-eSales/twig-component-pe.git"
36+
},
37+
"oxid-esales/twig-component-ee": {
38+
"type": "git",
39+
"url": "https://github.com/OXID-eSales/twig-component-ee.git"
40+
}
41+
},
42+
"config": {
43+
"allow-plugins": {
44+
"oxid-esales/oxideshop-composer-plugin": true,
45+
"oxid-esales/oxideshop-unified-namespace-generator": true
46+
}
5847
}
48+
}
5949
custom_script_container: |
6050
vendor/bin/oe-console oe:database:reset --db-host=mysql --db-port=3306 --db-name=example --db-user=root --db-password=root --force
6151
vendor/bin/oe-console oe:module:install ./
@@ -64,31 +54,28 @@ install:
6454
vendor/bin/oe-console oe:module:activate oe_security_module
6555
vendor/bin/oe-console oe:theme:activate apex
6656
67-
install_shop_with_modules:
68-
composer:
69-
root_url: ''
70-
7157
runscript: &runscript
7258
matrix:
7359
script: |
7460
[
75-
"security_module:tests-unit",
76-
"security_module:tests-integration",
77-
"security_module:tests-codeception"
61+
"report:tests-unit",
62+
"report:tests-integration",
63+
"no_report:tests-codeception"
7864
]
79-
composer:
80-
early: true
81-
security_module:
65+
report:
66+
path: ''
67+
no_report:
8268
path: ''
69+
coverage_prefix: ''
8370

8471
runslim:
8572
<<: *runscript
8673
matrix:
8774
script: |
8875
[
89-
"security_module:phpcs",
90-
"security_module:phpstan",
91-
"security_module:phpmd"
76+
"no_report:phpcs",
77+
"report:phpstan-report",
78+
"no_report:phpmd"
9279
]
9380
9481
sonarcloud:
@@ -98,12 +85,12 @@ sonarcloud:
9885
project_key: 'OXID-eSales_security-module'
9986
project_name: 'oxid-esales/security-module'
10087
organization: 'oxid-esales'
101-
parameters: |
102-
-Dsonar.language=php \
103-
-Dsonar.scm.provider=git \
104-
-Dsonar.sources=src \
105-
-Dsonar.tests=tests \
88+
parameters: >
89+
-Dsonar.language=php
90+
-Dsonar.scm.provider=git
91+
-Dsonar.sources=src
92+
-Dsonar.tests=tests
10693
-Dsonar.php.phpstan.reportPaths=coverage-reports/phpstan.report.json
10794
10895
finish:
109-
slack_title: 'Security module ({{ .Data.global.git.shop_ref }}) by {{ .Github.Actor }}'
96+
slack_title: 'Security module ({{ .Data.install.git.ref }}) by {{ .Github.Actor }}'

‎.github/oxid-esales/module-security-pe.yaml‎

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,36 @@
66
install:
77
cache:
88
prepared_shop: false
9-
git:
10-
repository: '{{ $repo }}'
11-
ref: &ref '{{ .Github.RefName }}'
12-
shop_url: 'https://github.com/OXID-eSales/security-module.git'
13-
shop_ref: *ref
14-
composer:
15-
root_url: ''
16-
transform: |
17-
{
18-
"require-dev": {
19-
"oxid-esales/oxideshop-ce": "{{ .Data.global.composer.dev_ref }}",
20-
"oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}",
21-
"oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
22-
"oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}",
23-
"oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
24-
"oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
25-
"oxid-esales/developer-tools": "{{ .Data.global.composer.dev_ref }}"
26-
},
27-
"repositories": {
28-
"oxid-esales/oxideshop-pe": {
29-
"type": "git",
30-
"url": "https://github.com/OXID-eSales/oxideshop_pe.git"
31-
},
32-
"oxid-esales/twig-component-ee": {
33-
"type": "git",
34-
"url": "https://github.com/OXID-eSales/twig-component-ee.git"
35-
}
36-
},
37-
"config": {
38-
"allow-plugins": {
39-
"oxid-esales/oxideshop-composer-plugin": true,
40-
"oxid-esales/oxideshop-unified-namespace-generator": true
41-
}
42-
}
9+
composer:
10+
root_url: ''
11+
transform: |
12+
{
13+
"require-dev": {
14+
"oxid-esales/oxideshop-ce": "{{ .Data.install.composer.dev_ref }}",
15+
"oxid-esales/oxideshop-pe": "{{ .Data.install.composer.dev_ref }}",
16+
"oxid-esales/twig-component": "{{ .Data.install.composer.dev_ref }}",
17+
"oxid-esales/twig-component-pe": "{{ .Data.install.composer.dev_ref }}",
18+
"oxid-esales/twig-admin-theme": "{{ .Data.install.composer.dev_ref }}",
19+
"oxid-esales/apex-theme": "{{ .Data.install.composer.dev_ref }}",
20+
"oxid-esales/developer-tools": "{{ .Data.install.composer.dev_ref }}"
21+
},
22+
"repositories": {
23+
"oxid-esales/oxideshop-pe": {
24+
"type": "git",
25+
"url": "https://github.com/OXID-eSales/oxideshop_pe.git"
26+
},
27+
"oxid-esales/twig-component-ee": {
28+
"type": "git",
29+
"url": "https://github.com/OXID-eSales/twig-component-ee.git"
30+
}
31+
},
32+
"config": {
33+
"allow-plugins": {
34+
"oxid-esales/oxideshop-composer-plugin": true,
35+
"oxid-esales/oxideshop-unified-namespace-generator": true
36+
}
4337
}
38+
}
4439
custom_script_container: |
4540
vendor/bin/oe-console oe:database:reset --db-host=mysql --db-port=3306 --db-name=example --db-user=root --db-password=root --force
4641
vendor/bin/oe-console oe:module:install ./
@@ -49,31 +44,28 @@ install:
4944
vendor/bin/oe-console oe:module:activate oe_security_module
5045
vendor/bin/oe-console oe:theme:activate apex
5146
52-
install_shop_with_modules:
53-
composer:
54-
root_url: ''
55-
5647
runscript: &runscript
5748
matrix:
5849
script: |
5950
[
60-
"security_module:tests-unit",
61-
"security_module:tests-integration",
62-
"security_module:tests-codeception"
51+
"report:tests-unit",
52+
"report:tests-integration",
53+
"no_report:tests-codeception"
6354
]
64-
composer:
65-
early: true
66-
security_module:
55+
report:
56+
path: ''
57+
no_report:
6758
path: ''
59+
coverage_prefix: ''
6860

6961
runslim:
7062
<<: *runscript
7163
matrix:
7264
script: |
7365
[
74-
"security_module:phpcs",
75-
"security_module:phpstan",
76-
"security_module:phpmd"
66+
"no_report:phpcs",
67+
"report:phpstan-report",
68+
"no_report:phpmd"
7769
]
7870
7971
sonarcloud:
@@ -83,12 +75,12 @@ sonarcloud:
8375
project_key: 'OXID-eSales_security-module'
8476
project_name: 'oxid-esales/security-module'
8577
organization: 'oxid-esales'
86-
parameters: |
87-
-Dsonar.language=php \
88-
-Dsonar.scm.provider=git \
89-
-Dsonar.sources=src \
90-
-Dsonar.tests=tests \
78+
parameters: >
79+
-Dsonar.language=php
80+
-Dsonar.scm.provider=git
81+
-Dsonar.sources=src
82+
-Dsonar.tests=tests
9183
-Dsonar.php.phpstan.reportPaths=coverage-reports/phpstan.report.json
9284
9385
finish:
94-
slack_title: 'Security module ({{ .Data.global.git.shop_ref }}) by {{ .Github.Actor }}'
86+
slack_title: 'Security module ({{ .Data.install.git.ref }}) by {{ .Github.Actor }}'

0 commit comments

Comments
 (0)