Skip to content

Commit 2086708

Browse files
VinaiVinai
authored
feat: add releases 2.4.4-p6, 2.4.5-p5 and 2.4.6-p3 (#169)
1 parent 68cbb2e commit 2086708

File tree

8 files changed

+105
-31
lines changed

8 files changed

+105
-31
lines changed

‎supported-version/dist/index.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎supported-version/src/kind/get-currently-supported.spec.ts‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,6 @@ describe('getCurrentlySupportedVersions for magento-open-source', () => {
1414
'magento/project-community-edition:2.4.4-p2',
1515
'magento/project-community-edition:2.4.5-p1',
1616
]],
17-
['2024-01-01T00:00:00Z', 'First day of 2024', [
18-
'magento/project-community-edition:2.4.4-p5',
19-
'magento/project-community-edition:2.4.5-p4',
20-
'magento/project-community-edition:2.4.6-p2',
21-
]],
22-
['2024-12-31T00:00:00Z', 'End of 2024', [
23-
'magento/project-community-edition:2.4.4-p5',
24-
'magento/project-community-edition:2.4.5-p4',
25-
'magento/project-community-edition:2.4.6-p2',
26-
]],
27-
['2025-08-08T00:00:00Z', 'Day Before v2.4.5 EoL', [
28-
'magento/project-community-edition:2.4.5-p4',
29-
'magento/project-community-edition:2.4.6-p2',
30-
]],
3117
['2023-03-14T00:00:00Z', 'Day of v2.4.6 Release', [
3218
'magento/project-community-edition:2.4.4-p2',
3319
'magento/project-community-edition:2.4.5-p1'
@@ -37,12 +23,36 @@ describe('getCurrentlySupportedVersions for magento-open-source', () => {
3723
'magento/project-community-edition:2.4.5-p2',
3824
'magento/project-community-edition:2.4.6'
3925
]],
40-
['2025-08-09T00:00:00Z', 'Day of v2.4.5 EoL', [
26+
['2023-10-09T00:00:00Z', 'Day before v2.4.6-p3 Release', [
27+
'magento/project-community-edition:2.4.4-p5',
4128
'magento/project-community-edition:2.4.5-p4',
42-
'magento/project-community-edition:2.4.6-p2',
29+
'magento/project-community-edition:2.4.6-p2'
30+
]],
31+
['2023-10-11T00:00:00Z', 'Day od v2.4.6-p3 Release', [
32+
'magento/project-community-edition:2.4.4-p6',
33+
'magento/project-community-edition:2.4.5-p5',
34+
'magento/project-community-edition:2.4.6-p3'
35+
]],
36+
['2024-01-01T00:00:00Z', 'First day of 2024', [
37+
'magento/project-community-edition:2.4.4-p6',
38+
'magento/project-community-edition:2.4.5-p5',
39+
'magento/project-community-edition:2.4.6-p3',
40+
]],
41+
['2024-12-31T00:00:00Z', 'End of 2024', [
42+
'magento/project-community-edition:2.4.4-p6',
43+
'magento/project-community-edition:2.4.5-p5',
44+
'magento/project-community-edition:2.4.6-p3',
45+
]],
46+
['2025-08-08T00:00:00Z', 'Day Before v2.4.5 EoL', [
47+
'magento/project-community-edition:2.4.5-p5',
48+
'magento/project-community-edition:2.4.6-p3',
49+
]],
50+
['2025-08-09T00:00:00Z', 'Day of v2.4.5 EoL', [
51+
'magento/project-community-edition:2.4.5-p5',
52+
'magento/project-community-edition:2.4.6-p3',
4353
]],
4454
['2025-08-10T00:00:00Z', 'Day after v2.4.5 EoL', [
45-
'magento/project-community-edition:2.4.6-p2',
55+
'magento/project-community-edition:2.4.6-p3',
4656
]],
4757
['2026-03-15T00:00:00Z', 'Day after v2.4.6 EoL', [
4858
]],
@@ -67,9 +77,12 @@ describe('getCurrentlySupportedVersions for mage-os', () => {
6777
test.each([
6878
['2023-01-01T00:00:00Z', 'First day of 2023', [
6979
]],
70-
['2024-01-01T00:00:00Z', 'First day of 2024', [
80+
['2023-10-10T15:00:00Z', 'Release of 1.0.0', [
7181
'mage-os/project-community-edition:1.0.0',
7282
]],
83+
['2024-01-01T00:00:00Z', 'First day of 2024', [
84+
'mage-os/project-community-edition:1.0.1',
85+
]],
7386
])(
7487
'supportedVersions for %s',
7588
(date, description ,result) => {

‎supported-version/src/kind/get-currently-supported.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ export const getCurrentlySupportedVersions = (project: string, date: Date): stri
55
const allVersions = getIndividualVersionsForProject(project)
66
return Object.entries(<Record<string,PackageMatrixVersion>>allVersions)
77
.filter(([key, value]) => {
8-
const dayAfterRelease = new Date(value.release);
9-
dayAfterRelease.setDate(dayAfterRelease.getDate() + 1);
10-
return date >= dayAfterRelease && new Date(value.eol) >= date;
8+
const dayOfRelease = new Date(value.release);
9+
dayOfRelease.setMinutes(dayOfRelease.getMinutes() + 1);
10+
return date >= dayOfRelease && new Date(value.eol) >= date;
1111
})
1212
.map(([key, value]) => key);
1313
}

‎supported-version/src/kind/validate-kinds.spec.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ describe('validateKind', () => {
1212
it('throws a helpful exception if custom versions are provided with the wrong kind', () => {
1313
expect(() => validateKind(<any>"latest", [])).toThrowError();
1414
})
15+
16+
it('returns `true` for kind `custom` with a custom versions', () => {
17+
expect(validateKind("custom", "mage-os/project-community-edition:1.0.0".split(","))).toBe(true);
18+
})
1519
})

‎supported-version/src/matrix/get-matrix-for-kind.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ describe('getMatrixForKind for mage-os', () => {
3030

3131
expect(result.magento).toBeDefined();
3232
expect(result.include).toBeDefined();
33+
expect(result.magento[0]).toBe('mage-os/project-community-edition:1.0.0');
3334
});
3435

3536
it('returns a matrix nightly`', () => {

‎supported-version/src/versions/mage-os/composite.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"varnish": "varnish:7.3",
1111
"nginx": "nginx:1.22",
1212
"os": "ubuntu-latest",
13-
"release": "2023-09-15T00:00:00+0000",
14-
"eol": "2026-09-15T00:00:00+0000"
13+
"release": "2023-10-10T00:00:00+0000",
14+
"eol": "2026-10-10T00:00:00+0000"
1515
},
1616
"mage-os/project-community-edition:next": {
1717
"magento": "mage-os/project-community-edition:next",
@@ -24,7 +24,7 @@
2424
"varnish": "varnish:7.3",
2525
"nginx": "nginx:1.22",
2626
"os": "ubuntu-latest",
27-
"release": "2023-09-15T00:00:00+0000",
28-
"eol": "2026-09-15T00:00:00+0000"
27+
"release": "2023-10-10T00:00:00+0000",
28+
"eol": "2026-10-10T00:00:00+0000"
2929
}
3030
}

‎supported-version/src/versions/mage-os/individual.json‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,21 @@
1010
"varnish": "varnish:7.3",
1111
"nginx": "nginx:1.22",
1212
"os": "ubuntu-latest",
13-
"release": "2023-09-15T00:00:00+0000",
14-
"eol": "2026-09-15T00:00:00+0000"
13+
"release": "2023-10-10T00:00:00+0000",
14+
"eol": "2023-10-11T00:00:00+0000"
15+
},
16+
"mage-os/project-community-edition:1.0.1": {
17+
"magento": "mage-os/project-community-edition:1.0.1",
18+
"php": 8.1,
19+
"composer": "2.2.21",
20+
"mysql": "mysql:8.0",
21+
"elasticsearch": "elasticsearch:8.5.3",
22+
"rabbitmq": "rabbitmq:3.9-management",
23+
"redis": "redis:7.0",
24+
"varnish": "varnish:7.3",
25+
"nginx": "nginx:1.22",
26+
"os": "ubuntu-latest",
27+
"release": "2023-10-11T00:00:00+0000",
28+
"eol": "2026-10-11T00:00:00+0000"
1529
}
1630
}

‎supported-version/src/versions/magento-open-source/individual.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,20 @@
263263
"nginx": "nginx:1.22",
264264
"os": "ubuntu-latest",
265265
"release": "2023-08-08T00:00:00+0000",
266+
"eol": "2023-10-10T00:00:00+0000"
267+
},
268+
"magento/project-community-edition:2.4.4-p6": {
269+
"magento": "magento/project-community-edition:2.4.4-p6",
270+
"php": 8.1,
271+
"composer": "2.2.21",
272+
"mysql": "mysql:8.0",
273+
"elasticsearch": "elasticsearch:7.17.5",
274+
"rabbitmq": "rabbitmq:3.9-management",
275+
"redis": "redis:6.2",
276+
"varnish": "varnish:7.3",
277+
"nginx": "nginx:1.22",
278+
"os": "ubuntu-latest",
279+
"release": "2023-10-10T00:00:00+0000",
266280
"eol": "2025-04-24T00:00:00+0000"
267281
},
268282
"magento/project-community-edition:2.4.5": {
@@ -333,6 +347,20 @@
333347
"nginx": "nginx:1.22",
334348
"os": "ubuntu-latest",
335349
"release": "2023-08-08T00:00:00+0000",
350+
"eol": "2023-10-10T00:00:00+0000"
351+
},
352+
"magento/project-community-edition:2.4.5-p5": {
353+
"magento": "magento/project-community-edition:2.4.5-p5",
354+
"php": 8.1,
355+
"composer": "2.2.21",
356+
"mysql": "mysql:8.0",
357+
"elasticsearch": "elasticsearch:7.17.5",
358+
"rabbitmq": "rabbitmq:3.11-management",
359+
"redis": "redis:6.2",
360+
"varnish": "varnish:7.1",
361+
"nginx": "nginx:1.22",
362+
"os": "ubuntu-latest",
363+
"release": "2023-10-10T00:00:00+0000",
336364
"eol": "2025-08-09T00:00:00+0000"
337365
},
338366
"magento/project-community-edition:2.4.6": {
@@ -375,6 +403,20 @@
375403
"nginx": "nginx:1.22",
376404
"os": "ubuntu-latest",
377405
"release": "2023-08-08T00:00:00+0000",
406+
"eol": "2023-10-10T00:00:00+0000"
407+
},
408+
"magento/project-community-edition:2.4.6-p3": {
409+
"magento": "magento/project-community-edition:2.4.6-p3",
410+
"php": 8.1,
411+
"composer": "2.2.21",
412+
"mysql": "mysql:8.0",
413+
"elasticsearch": "elasticsearch:8.5.3",
414+
"rabbitmq": "rabbitmq:3.9-management",
415+
"redis": "redis:7.0",
416+
"varnish": "varnish:7.3",
417+
"nginx": "nginx:1.22",
418+
"os": "ubuntu-latest",
419+
"release": "2023-10-10T00:00:00+0000",
378420
"eol": "2026-03-14T00:00:00+0000"
379421
}
380422
}

0 commit comments

Comments
 (0)