Skip to content

Commit 2844fcd

Browse files
sprankhubsprankhub
authored
Merge pull request #227 from firegento/sprankhub-patch-1
Add PHP 8.4 support
2 parents edb0707 + e7eab35 commit 2844fcd

File tree

2 files changed

+89
-19
lines changed

2 files changed

+89
-19
lines changed

‎.github/workflows/integration.yml‎

Lines changed: 88 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: ExtDN M2 Integration Tests
2-
on: [pull_request]
2+
on: [ push, pull_request ]
33

44
jobs:
5-
integration-tests:
6-
name: Magento 2 Integration Tests
5+
integration-tests-245:
6+
name: Magento 2 Integration Tests (Magento 2.4.5)
77
runs-on: ubuntu-latest
88
services:
99
mysql:
@@ -24,26 +24,96 @@ jobs:
2424
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
2525
steps:
2626
- uses: actions/checkout@v4
27-
- name: M2 Integration Tests with Magento 2 Version 2.4.5-p8 (PHP 8.1)
27+
- name: M2 Integration Tests with Magento 2 Version 2.4.5-p12 (PHP 8.1)
2828
uses: extdn/github-actions-m2/magento-integration-tests/8.1@master
2929
with:
30-
module_name: FireGento_MageSetup
31-
composer_name: firegento/magesetup2
32-
magento_version: '2.4.5-p8'
33-
composer_version: '2'
30+
module_name: FireGento_MageSetup
31+
composer_name: firegento/magesetup2
32+
magento_version: '2.4.5-p12'
33+
composer_version: '2'
34+
integration-tests-246:
35+
name: Magento 2 Integration Tests (Magento 2.4.6)
36+
runs-on: ubuntu-latest
37+
services:
38+
mysql:
39+
image: mysql:8.0
40+
env:
41+
MYSQL_ROOT_PASSWORD: root
42+
ports:
43+
- 3306:3306
44+
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
45+
es:
46+
image: docker.io/wardenenv/elasticsearch:7.8
47+
ports:
48+
- 9200:9200
49+
env:
50+
'discovery.type': single-node
51+
'xpack.security.enabled': false
52+
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
53+
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
54+
steps:
3455
- uses: actions/checkout@v4
35-
- name: M2 Integration Tests with Magento 2 Version 2.4.6-p6 (PHP 8.2)
56+
- name: M2 Integration Tests with Magento 2 Version 2.4.6-p10 (PHP 8.2)
3657
uses: extdn/github-actions-m2/magento-integration-tests/8.2@master
3758
with:
38-
module_name: FireGento_MageSetup
39-
composer_name: firegento/magesetup2
40-
magento_version: '2.4.6-p6'
41-
composer_version: '2'
59+
module_name: FireGento_MageSetup
60+
composer_name: firegento/magesetup2
61+
magento_version: '2.4.6-p10'
62+
composer_version: '2'
63+
integration-tests-247:
64+
name: Magento 2 Integration Tests (Magento 2.4.7)
65+
runs-on: ubuntu-latest
66+
services:
67+
mysql:
68+
image: mysql:8.0
69+
env:
70+
MYSQL_ROOT_PASSWORD: root
71+
ports:
72+
- 3306:3306
73+
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
74+
es:
75+
image: docker.io/wardenenv/elasticsearch:7.8
76+
ports:
77+
- 9200:9200
78+
env:
79+
'discovery.type': single-node
80+
'xpack.security.enabled': false
81+
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
82+
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
83+
steps:
4284
- uses: actions/checkout@v4
43-
- name: M2 Integration Tests with Magento 2 Version 2.4.7-p1 (PHP 8.3)
85+
- name: M2 Integration Tests with Magento 2 Version 2.4.7-p5 (PHP 8.3)
4486
uses: extdn/github-actions-m2/magento-integration-tests/8.3@master
4587
with:
46-
module_name: FireGento_MageSetup
47-
composer_name: firegento/magesetup2
48-
magento_version: '2.4.7-p1'
49-
composer_version: '2'
88+
module_name: FireGento_MageSetup
89+
composer_name: firegento/magesetup2
90+
magento_version: '2.4.7-p5'
91+
composer_version: '2'
92+
integration-tests-248:
93+
name: Magento 2 Integration Tests (Magento 2.4.8)
94+
runs-on: ubuntu-latest
95+
services:
96+
mysql:
97+
image: mysql:8.0
98+
env:
99+
MYSQL_ROOT_PASSWORD: root
100+
ports:
101+
- 3306:3306
102+
options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
103+
es:
104+
image: docker.io/wardenenv/elasticsearch:8.1
105+
ports:
106+
- 9200:9200
107+
env:
108+
'discovery.type': single-node
109+
'xpack.security.enabled': false
110+
ES_JAVA_OPTS: "-Xms64m -Xmx512m"
111+
options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3
112+
steps:
113+
- name: M2 Integration Tests with Magento 2 Version 2.4.8 (PHP 8.4)
114+
uses: extdn/github-actions-m2/magento-integration-tests/8.4@master
115+
with:
116+
module_name: FireGento_MageSetup
117+
composer_name: firegento/magesetup2
118+
magento_version: '2.4.8'
119+
composer_version: '2'

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "firegento/magesetup2",
33
"description": "MageSetup provides the necessary configuration (system config, tax, agreements, etc. for a national market.",
44
"require": {
5-
"php": "~7.3.0||~7.4.0||~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~7.3.0||~7.4.0||~8.1.0||~8.2.0||~8.3.0||~8.4.0",
66
"magento/module-store": "*",
77
"magento/module-backend": "*",
88
"magento/framework": ">=103.0.3"

0 commit comments

Comments
 (0)