Skip to content

Commit a8edab7

Browse files
sprankhubsprankhub
authored
Merge pull request #7 from customgento/DEV-569-update-module-admin-payment
Update module and github actions, DEV-569
2 parents 8d29c36 + 12840ff commit a8edab7

File tree

5 files changed

+14
-367
lines changed

5 files changed

+14
-367
lines changed

‎.github/workflows/coding-standard.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,5 @@ name: ExtDN M2 Coding Standard
22
on: [push, pull_request]
33

44
jobs:
5-
static:
6-
name: M2 Coding Standard
7-
runs-on: ubuntu-latest
8-
steps:
9-
- uses: actions/checkout@v4
10-
- uses: extdn/github-actions-m2/magento-coding-standard@master
5+
phpcs:
6+
uses: customgento/m2-github-actions/.github/workflows/coding-standard.yml@main

‎.github/workflows/integration.yml

+6-348
Original file line numberDiff line numberDiff line change
@@ -1,351 +1,9 @@
11
name: ExtDN M2 Integration Tests
22
on: [ push, pull_request ]
3+
34
jobs:
4-
integration-tests-2-4-4-p6-8-1:
5-
name: Magento 2.4.4-p6 PHP 8.1 Integration Tests
6-
runs-on: ubuntu-latest
7-
services:
8-
mysql:
9-
image: mysql:5.7
10-
env:
11-
MYSQL_ROOT_PASSWORD: root
12-
ports:
13-
- 3306:3306
14-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
15-
es:
16-
image: docker.io/wardenenv/elasticsearch:7.8
17-
ports:
18-
- 9200:9200
19-
env:
20-
'discovery.type': single-node
21-
'xpack.security.enabled': false
22-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
23-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
24-
steps:
25-
- uses: actions/checkout@v4
26-
- name: M2 Integration Tests with Magento 2 Version 2.4.4-p6 (PHP 8.1)
27-
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
28-
with:
29-
module_name: CustomGento_AdminPayment
30-
composer_name: customgento/module-admin-payment-m2
31-
ce_version: '2.4.4-p6'
32-
composer_version: '2'
33-
integration-tests-2-4-4-p6-7-4:
34-
name: Magento 2.4.4-p6 PHP 7.4 Integration Tests
35-
runs-on: ubuntu-latest
36-
services:
37-
mysql:
38-
image: mysql:5.7
39-
env:
40-
MYSQL_ROOT_PASSWORD: root
41-
ports:
42-
- 3306:3306
43-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
44-
es:
45-
image: docker.io/wardenenv/elasticsearch:7.8
46-
ports:
47-
- 9200:9200
48-
env:
49-
'discovery.type': single-node
50-
'xpack.security.enabled': false
51-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
52-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
53-
steps:
54-
- uses: actions/checkout@v4
55-
- name: M2 Integration Tests with Magento 2 Version 2.4.4-p6 (PHP 7.4)
56-
uses: extdn/github-actions-m2/magento-integration-tests/7.4@master
57-
with:
58-
module_name: CustomGento_AdminPayment
59-
composer_name: customgento/module-admin-payment-m2
60-
ce_version: '2.4.4-p6'
61-
composer_version: '2'
62-
integration-tests-2-4-4-p5-7-4:
63-
name: Magento 2.4.4-p5 PHP 7.4 Integration Tests
64-
runs-on: ubuntu-latest
65-
services:
66-
mysql:
67-
image: mysql:5.7
68-
env:
69-
MYSQL_ROOT_PASSWORD: root
70-
ports:
71-
- 3306:3306
72-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
73-
es:
74-
image: docker.io/wardenenv/elasticsearch:7.8
75-
ports:
76-
- 9200:9200
77-
env:
78-
'discovery.type': single-node
79-
'xpack.security.enabled': false
80-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
81-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
82-
steps:
83-
- uses: actions/checkout@v4
84-
- name: M2 Integration Tests with Magento 2 Version 2.4.4-p5 (PHP 7.4)
85-
uses: extdn/github-actions-m2/magento-integration-tests/7.4@master
86-
with:
87-
module_name: CustomGento_AdminPayment
88-
composer_name: customgento/module-admin-payment-m2
89-
ce_version: '2.4.4-p5'
90-
composer_version: '2'
91-
integration-tests-2-4-4-p5-8-1:
92-
name: Magento 2.4.4-p5 PHP 8.1 Integration Tests
93-
runs-on: ubuntu-latest
94-
services:
95-
mysql:
96-
image: mysql:5.7
97-
env:
98-
MYSQL_ROOT_PASSWORD: root
99-
ports:
100-
- 3306:3306
101-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
102-
es:
103-
image: docker.io/wardenenv/elasticsearch:7.8
104-
ports:
105-
- 9200:9200
106-
env:
107-
'discovery.type': single-node
108-
'xpack.security.enabled': false
109-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
110-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
111-
steps:
112-
- uses: actions/checkout@v4
113-
- name: M2 Integration Tests with Magento 2 Version 2.4.4-p5 (PHP 8.1)
114-
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
115-
with:
116-
module_name: CustomGento_AdminPayment
117-
composer_name: customgento/module-admin-payment-m2
118-
ce_version: '2.4.4-p5'
119-
composer_version: '2'
120-
integration-tests-2-4-5-p5-8-1:
121-
name: Magento 2.4.5-p5 PHP 8.1 Integration Tests
122-
runs-on: ubuntu-latest
123-
services:
124-
mysql:
125-
image: mysql:5.7
126-
env:
127-
MYSQL_ROOT_PASSWORD: root
128-
ports:
129-
- 3306:3306
130-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
131-
es:
132-
image: docker.io/wardenenv/elasticsearch:7.8
133-
ports:
134-
- 9200:9200
135-
env:
136-
'discovery.type': single-node
137-
'xpack.security.enabled': false
138-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
139-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
140-
steps:
141-
- uses: actions/checkout@v4
142-
- name: M2 Integration Tests with Magento 2 Version 2.4.5-p5 (PHP 8.1)
143-
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
144-
with:
145-
module_name: CustomGento_AdminPayment
146-
composer_name: customgento/module-admin-payment-m2
147-
ce_version: '2.4.5-p5'
148-
composer_version: '2'
149-
integration-tests-2-4-5-p5-7-4:
150-
name: Magento 2.4.5-p5 PHP 7.4 Integration Tests
151-
runs-on: ubuntu-latest
152-
services:
153-
mysql:
154-
image: mysql:5.7
155-
env:
156-
MYSQL_ROOT_PASSWORD: root
157-
ports:
158-
- 3306:3306
159-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
160-
es:
161-
image: docker.io/wardenenv/elasticsearch:7.8
162-
ports:
163-
- 9200:9200
164-
env:
165-
'discovery.type': single-node
166-
'xpack.security.enabled': false
167-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
168-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
169-
steps:
170-
- uses: actions/checkout@v4
171-
- name: M2 Integration Tests with Magento 2 Version 2.4.5-p5 (PHP 7.4)
172-
uses: extdn/github-actions-m2/magento-integration-tests/7.4@master
173-
with:
174-
module_name: CustomGento_AdminPayment
175-
composer_name: customgento/module-admin-payment-m2
176-
ce_version: '2.4.5-p5'
177-
composer_version: '2'
178-
integration-tests-2-4-5-p4-7-4:
179-
name: Magento 2.4.5-p4 PHP 7.4 Integration Tests
180-
runs-on: ubuntu-latest
181-
services:
182-
mysql:
183-
image: mysql:5.7
184-
env:
185-
MYSQL_ROOT_PASSWORD: root
186-
ports:
187-
- 3306:3306
188-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
189-
es:
190-
image: docker.io/wardenenv/elasticsearch:7.8
191-
ports:
192-
- 9200:9200
193-
env:
194-
'discovery.type': single-node
195-
'xpack.security.enabled': false
196-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
197-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
198-
steps:
199-
- uses: actions/checkout@v4
200-
- name: M2 Integration Tests with Magento 2 Version 2.4.5-p4 (PHP 7.4)
201-
uses: extdn/github-actions-m2/magento-integration-tests/7.4@master
202-
with:
203-
module_name: CustomGento_AdminPayment
204-
composer_name: customgento/module-admin-payment-m2
205-
ce_version: '2.4.5-p4'
206-
composer_version: '2'
207-
integration-tests-2-4-5-p4-8-1:
208-
name: Magento 2.4.5-p4 PHP 8.1 Integration Tests
209-
runs-on: ubuntu-latest
210-
services:
211-
mysql:
212-
image: mysql:5.7
213-
env:
214-
MYSQL_ROOT_PASSWORD: root
215-
ports:
216-
- 3306:3306
217-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
218-
es:
219-
image: docker.io/wardenenv/elasticsearch:7.8
220-
ports:
221-
- 9200:9200
222-
env:
223-
'discovery.type': single-node
224-
'xpack.security.enabled': false
225-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
226-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
227-
steps:
228-
- uses: actions/checkout@v4
229-
- name: M2 Integration Tests with Magento 2 Version 2.4.5-p4 (PHP 8.1)
230-
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
231-
with:
232-
module_name: CustomGento_AdminPayment
233-
composer_name: customgento/module-admin-payment-m2
234-
ce_version: '2.4.5-p4'
235-
composer_version: '2'
236-
integration-tests-2-4-6-p3-8-1:
237-
name: Magento 2.4.6-p3 PHP 8.1 Integration Tests
238-
runs-on: ubuntu-latest
239-
services:
240-
mysql:
241-
image: mysql:5.7
242-
env:
243-
MYSQL_ROOT_PASSWORD: root
244-
ports:
245-
- 3306:3306
246-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
247-
es:
248-
image: docker.io/wardenenv/elasticsearch:7.8
249-
ports:
250-
- 9200:9200
251-
env:
252-
'discovery.type': single-node
253-
'xpack.security.enabled': false
254-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
255-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
256-
steps:
257-
- uses: actions/checkout@v4
258-
- name: M2 Integration Tests with Magento 2 Version 2.4.6-p3 (PHP 8.1)
259-
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
260-
with:
261-
module_name: CustomGento_AdminPayment
262-
composer_name: customgento/module-admin-payment-m2
263-
ce_version: '2.4.6-p3'
264-
composer_version: '2'
265-
integration-tests-2-4-6-p3-8-2:
266-
name: Magento 2.4.6-p3 PHP 8.2 Integration Tests
267-
runs-on: ubuntu-latest
268-
services:
269-
mysql:
270-
image: mysql:5.7
271-
env:
272-
MYSQL_ROOT_PASSWORD: root
273-
ports:
274-
- 3306:3306
275-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
276-
es:
277-
image: docker.io/wardenenv/elasticsearch:7.8
278-
ports:
279-
- 9200:9200
280-
env:
281-
'discovery.type': single-node
282-
'xpack.security.enabled': false
283-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
284-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
285-
steps:
286-
- uses: actions/checkout@v4
287-
- name: M2 Integration Tests with Magento 2 Version 2.4.6-p3 (PHP 8.2)
288-
uses: extdn/github-actions-m2/magento-integration-tests/8.2@master
289-
with:
290-
module_name: CustomGento_AdminPayment
291-
composer_name: customgento/module-admin-payment-m2
292-
ce_version: '2.4.6-p3'
293-
composer_version: '2'
294-
integration-tests-2-4-6-p2-8-2:
295-
name: Magento 2.4.6-p2 PHP 8.2 Integration Tests
296-
runs-on: ubuntu-latest
297-
services:
298-
mysql:
299-
image: mysql:5.7
300-
env:
301-
MYSQL_ROOT_PASSWORD: root
302-
ports:
303-
- 3306:3306
304-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
305-
es:
306-
image: docker.io/wardenenv/elasticsearch:7.8
307-
ports:
308-
- 9200:9200
309-
env:
310-
'discovery.type': single-node
311-
'xpack.security.enabled': false
312-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
313-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
314-
steps:
315-
- uses: actions/checkout@v4
316-
- name: M2 Integration Tests with Magento 2 Version 2.4.6-p2 (PHP 8.2)
317-
uses: extdn/github-actions-m2/magento-integration-tests/8.2@master
318-
with:
319-
module_name: CustomGento_AdminPayment
320-
composer_name: customgento/module-admin-payment-m2
321-
ce_version: '2.4.6-p2'
322-
composer_version: '2'
323-
integration-tests-2-4-6-p2-8-1:
324-
name: Magento 2.4.6-p2 PHP 8.1 Integration Tests
325-
runs-on: ubuntu-latest
326-
services:
327-
mysql:
328-
image: mysql:5.7
329-
env:
330-
MYSQL_ROOT_PASSWORD: root
331-
ports:
332-
- 3306:3306
333-
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
334-
es:
335-
image: docker.io/wardenenv/elasticsearch:7.8
336-
ports:
337-
- 9200:9200
338-
env:
339-
'discovery.type': single-node
340-
'xpack.security.enabled': false
341-
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
342-
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
343-
steps:
344-
- uses: actions/checkout@v4
345-
- name: M2 Integration Tests with Magento 2 Version 2.4.6-p2 (PHP 8.1)
346-
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
347-
with:
348-
module_name: CustomGento_AdminPayment
349-
composer_name: customgento/module-admin-payment-m2
350-
ce_version: '2.4.6-p2'
351-
composer_version: '2'
5+
integration:
6+
uses: customgento/m2-github-actions/.github/workflows/integration.yml@main
7+
with:
8+
module_name: CustomGento_AdminPayment
9+
composer_name: customgento/module-admin-payment-m2

‎.github/workflows/mess-detector.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@ on: [push, pull_request]
33

44
jobs:
55
phpmd:
6-
name: M2 Mess Detector
7-
runs-on: ubuntu-latest
8-
steps:
9-
- uses: actions/checkout@v4
10-
- uses: extdn/github-actions-m2/magento-mess-detector@master
6+
uses: customgento/m2-github-actions/.github/workflows/mess-detector.yml@main

‎.github/workflows/phpstan.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ on: [push, pull_request]
33

44
jobs:
55
phpstan:
6-
name: M2 PHPStan
7-
runs-on: ubuntu-latest
8-
steps:
9-
- uses: actions/checkout@v4
10-
- uses: extdn/github-actions-m2/magento-phpstan@master
11-
with:
12-
composer_name: customgento/module-admin-payment-m2
6+
uses: customgento/m2-github-actions/.github/workflows/phpstan.yml@main
7+
with:
8+
composer_name: customgento/module-admin-payment-m2
9+

0 commit comments

Comments
 (0)