diff --git a/data/debian-distro-info.json b/data/debian-distro-info.json
index 26e6896960d82472f3d4ed5cd1bb569ea504db3a..d305afeb604b4f899f8aa15f5dd74b1998d5db8b 100644
--- a/data/debian-distro-info.json
+++ b/data/debian-distro-info.json
@@ -123,11 +123,18 @@
"v12": {
"codename": "Bookworm",
"series": "bookworm",
- "created": "2021-08-14"
+ "created": "2021-08-14",
+ "release": "2023-06-10",
+ "eol": "2026-06-10"
},
"v13": {
"codename": "Trixie",
"series": "trixie",
- "created": "2023-08-01"
+ "created": "2023-06-10"
+ },
+ "v14": {
+ "codename": "Forky",
+ "series": "forky",
+ "created": "2025-08-01"
}
}
diff --git a/data/ubuntu-distro-info.json b/data/ubuntu-distro-info.json
index 442b832cc7dcf96690ed7fb41a9aab8de22ac478..eefc999c8cd187b4d6c01a2665bbbffc07bf07f7 100644
--- a/data/ubuntu-distro-info.json
+++ b/data/ubuntu-distro-info.json
@@ -202,8 +202,8 @@
"series": "bionic",
"created": "2017-10-19",
"release": "2018-04-26",
- "eol": "2023-04-26",
- "eol_server": "2023-04-26",
+ "eol": "2023-05-31",
+ "eol_server": "2023-05-31",
"eol_esm": "2028-04-26"
},
"v18.10": {
@@ -232,8 +232,8 @@
"series": "focal",
"created": "2019-10-17",
"release": "2020-04-23",
- "eol": "2025-04-23",
- "eol_server": "2025-04-23",
+ "eol": "2025-05-29",
+ "eol_server": "2025-05-29",
"eol_esm": "2030-04-23"
},
"v20.10": {
@@ -262,8 +262,8 @@
"series": "jammy",
"created": "2021-10-14",
"release": "2022-04-21",
- "eol": "2027-04-21",
- "eol_server": "2027-04-21",
+ "eol": "2027-06-01",
+ "eol_server": "2027-06-01",
"eol_esm": "2032-04-21"
},
"v22.10": {
@@ -277,7 +277,14 @@
"codename": "Lunar Lobster",
"series": "lunar",
"created": "2022-10-20",
- "release": "2023-04-27",
+ "release": "2023-04-20",
"eol": "2024-01-25"
+ },
+ "v23.10": {
+ "codename": "Mantic Minotaur",
+ "series": "mantic",
+ "created": "2023-04-20",
+ "release": "2023-10-12",
+ "eol": "2024-07-11"
}
}
diff --git a/lib/modules/versioning/debian/index.spec.ts b/lib/modules/versioning/debian/index.spec.ts
index 4759c9f1ad908a64084e99a7e9a512fad2f7cd98..8db760b072d4cd2449e4e3c718faeef6348158fa 100644
--- a/lib/modules/versioning/debian/index.spec.ts
+++ b/lib/modules/versioning/debian/index.spec.ts
@@ -3,7 +3,7 @@ import { logger } from '../../../logger';
import { DebianVersioningApi } from '.';
describe('modules/versioning/debian/index', () => {
- const dt = DateTime.fromISO('2022-04-20');
+ const dt = DateTime.fromISO('2023-07-10');
const debian = new DebianVersioningApi();
@@ -37,7 +37,7 @@ describe('modules/versioning/debian/index', () => {
${'buster'} | ${true}
${'Buster'} | ${false}
${'bullseye'} | ${true}
- ${'bookworm'} | ${false}
+ ${'bookworm'} | ${true}
${'trixie'} | ${false}
${'sid'} | ${false}
${'1.1'} | ${true}
@@ -56,7 +56,7 @@ describe('modules/versioning/debian/index', () => {
${'10'} | ${true}
${'10-slim'} | ${false}
${'11'} | ${true}
- ${'12'} | ${false}
+ ${'12'} | ${true}
${'13'} | ${false}
${'sid'} | ${false}
${'stable'} | ${true}
@@ -75,13 +75,14 @@ describe('modules/versioning/debian/index', () => {
${''} | ${undefined} | ${false}
${'7'} | ${undefined} | ${true}
${'11'} | ${undefined} | ${true}
- ${'12'} | ${undefined} | ${false}
+ ${'12'} | ${undefined} | ${true}
${'stable'} | ${undefined} | ${true}
${'oldstable'} | ${undefined} | ${true}
${'oldoldstable'} | ${undefined} | ${true}
${'wheezy'} | ${undefined} | ${true}
${'bullseye'} | ${undefined} | ${true}
- ${'bookworm'} | ${undefined} | ${false}
+ ${'bookworm'} | ${undefined} | ${true}
+ ${'trixie'} | ${undefined} | ${false}
`(
'isCompatible("$version") === $expected',
({ version, range, expected }) => {
@@ -118,10 +119,10 @@ describe('modules/versioning/debian/index', () => {
${'squeeze'} | ${false}
${'wheezy'} | ${false}
${'jessie'} | ${false}
- ${'stretch'} | ${true}
+ ${'stretch'} | ${false}
${'buster'} | ${true}
${'bullseye'} | ${true}
- ${'bookworm'} | ${false}
+ ${'bookworm'} | ${true}
${'trixie'} | ${false}
${'sid'} | ${false}
${'1.1'} | ${false}
@@ -136,10 +137,10 @@ describe('modules/versioning/debian/index', () => {
${'6'} | ${false}
${'7'} | ${false}
${'8'} | ${false}
- ${'9'} | ${true}
+ ${'9'} | ${false}
${'10'} | ${true}
${'11'} | ${true}
- ${'12'} | ${false}
+ ${'12'} | ${true}
${'13'} | ${false}
${'sid'} | ${false}
${'experimental'} | ${false}
@@ -210,7 +211,7 @@ describe('modules/versioning/debian/index', () => {
${'stretch'} | ${true}
${'buster'} | ${true}
${'bullseye'} | ${true}
- ${'bookworm'} | ${false}
+ ${'bookworm'} | ${true}
${'trixie'} | ${false}
${'sid'} | ${false}
${'1.1'} | ${true}
@@ -228,7 +229,7 @@ describe('modules/versioning/debian/index', () => {
${'9'} | ${true}
${'10'} | ${true}
${'11'} | ${true}
- ${'12'} | ${false}
+ ${'12'} | ${true}
${'13'} | ${false}
${'sid'} | ${false}
${'experimental'} | ${false}
@@ -256,9 +257,9 @@ describe('modules/versioning/debian/index', () => {
${'8'} | ${8} | ${null} | ${null}
${'9'} | ${9} | ${null} | ${null}
${'10'} | ${10} | ${null} | ${null}
- ${'oldoldstable'} | ${9} | ${null} | ${null}
- ${'oldstable'} | ${10} | ${null} | ${null}
- ${'stable'} | ${11} | ${null} | ${null}
+ ${'oldoldstable'} | ${10} | ${null} | ${null}
+ ${'oldstable'} | ${11} | ${null} | ${null}
+ ${'stable'} | ${12} | ${null} | ${null}
`(
'getMajor, getMinor, getPatch for "$version"',
({ version, major, minor, patch }) => {
@@ -277,12 +278,12 @@ describe('modules/versioning/debian/index', () => {
${'10'} | ${'buster'} | ${true}
${'6'} | ${'squeeze'} | ${true}
${'buster'} | ${'10'} | ${true}
- ${'oldoldstable'} | ${'9'} | ${true}
- ${'oldstable'} | ${'10'} | ${true}
- ${'stable'} | ${'11'} | ${true}
- ${'9'} | ${'oldoldstable'} | ${true}
- ${'10'} | ${'oldstable'} | ${true}
- ${'11'} | ${'stable'} | ${true}
+ ${'oldoldstable'} | ${'10'} | ${true}
+ ${'oldstable'} | ${'11'} | ${true}
+ ${'stable'} | ${'12'} | ${true}
+ ${'10'} | ${'oldoldstable'} | ${true}
+ ${'11'} | ${'oldstable'} | ${true}
+ ${'12'} | ${'stable'} | ${true}
`('equals($a, $b) === $expected', ({ a, b, expected }) => {
expect(debian.equals(a, b)).toBe(expected);
});
@@ -307,9 +308,9 @@ describe('modules/versioning/debian/index', () => {
${'oldoldstable'} | ${'8'} | ${true}
${'oldstable'} | ${'oldoldstable'} | ${true}
${'stable'} | ${'oldstable'} | ${true}
- ${'11'} | ${'oldoldstable'} | ${true}
- ${'10'} | ${'oldstable'} | ${false}
- ${'9'} | ${'stable'} | ${false}
+ ${'12'} | ${'oldoldstable'} | ${true}
+ ${'11'} | ${'oldstable'} | ${false}
+ ${'10'} | ${'stable'} | ${false}
`('isGreaterThan("$a", "$b") === $expected', ({ a, b, expected }) => {
expect(debian.isGreaterThan(a, b)).toBe(expected);
});
@@ -326,7 +327,7 @@ describe('modules/versioning/debian/index', () => {
${['jessie', 'stretch', 'buster', 'bullseye']} | ${'bullseye'} | ${'bullseye'}
${['jessie', 'stretch', 'buster', 'bullseye']} | ${'buster'} | ${'buster'}
${['jessie', 'stretch', 'buster', 'stable']} | ${'stable'} | ${'stable'}
- ${['jessie', 'stretch', 'oldstable', 'bullseye']} | ${'buster'} | ${'oldstable'}
+ ${['jessie', 'stretch', 'oldstable', 'bullseye']} | ${'bullseye'} | ${'oldstable'}
${['jessie', 'oldoldstable', 'buster', 'bullseye']} | ${'warty'} | ${null}
`(
'getSatisfyingVersion($versions, "$range") === "$expected"',
@@ -348,7 +349,7 @@ describe('modules/versioning/debian/index', () => {
${['jessie', 'stretch', 'buster', 'bullseye']} | ${'buster'} | ${'buster'}
${['jessie', 'stretch', 'buster', 'bullseye']} | ${'warty'} | ${null}
${['jessie', 'stretch', 'buster', 'stable']} | ${'stable'} | ${'stable'}
- ${['jessie', 'stretch', 'oldstable', 'bullseye']} | ${'buster'} | ${'oldstable'}
+ ${['jessie', 'stretch', 'oldstable', 'bullseye']} | ${'bullseye'} | ${'oldstable'}
${['jessie', 'oldoldstable', 'buster', 'bullseye']} | ${'warty'} | ${null}
`(
'minSatisfyingVersion($versions, "$range") === "$expected"',
@@ -362,21 +363,21 @@ describe('modules/versioning/debian/index', () => {
${undefined} | ${undefined} | ${undefined} | ${'foobar'} | ${'foobar'}
${'stretch'} | ${undefined} | ${undefined} | ${'11'} | ${'bullseye'}
${'stretch'} | ${undefined} | ${undefined} | ${'bullseye'} | ${'bullseye'}
- ${'stretch'} | ${undefined} | ${undefined} | ${'stable'} | ${'bullseye'}
+ ${'stretch'} | ${undefined} | ${undefined} | ${'stable'} | ${'bookworm'}
${'9'} | ${undefined} | ${undefined} | ${'11'} | ${'11'}
- ${'oldoldstable'} | ${undefined} | ${undefined} | ${'11'} | ${'stable'}
- ${'oldstable'} | ${undefined} | ${undefined} | ${'11'} | ${'stable'}
- ${'9'} | ${undefined} | ${undefined} | ${'stable'} | ${'11'}
- ${'oldstable'} | ${undefined} | ${undefined} | ${'11'} | ${'stable'}
+ ${'oldoldstable'} | ${undefined} | ${undefined} | ${'12'} | ${'stable'}
+ ${'oldstable'} | ${undefined} | ${undefined} | ${'12'} | ${'stable'}
+ ${'9'} | ${undefined} | ${undefined} | ${'stable'} | ${'12'}
+ ${'oldstable'} | ${undefined} | ${undefined} | ${'12'} | ${'stable'}
${'oldstable'} | ${undefined} | ${undefined} | ${'3'} | ${'3'}
${'oldstable'} | ${'pin'} | ${undefined} | ${'11'} | ${'11'}
- ${'oldstable'} | ${'pin'} | ${undefined} | ${'stable'} | ${'11'}
+ ${'oldstable'} | ${'pin'} | ${undefined} | ${'stable'} | ${'12'}
${'oldstable'} | ${'pin'} | ${undefined} | ${'bullseye'} | ${'11'}
${'buster'} | ${'pin'} | ${undefined} | ${'11'} | ${'11'}
- ${'buster'} | ${'pin'} | ${undefined} | ${'stable'} | ${'11'}
+ ${'buster'} | ${'pin'} | ${undefined} | ${'stable'} | ${'12'}
${'buster'} | ${'pin'} | ${undefined} | ${'bullseye'} | ${'11'}
${'10'} | ${'pin'} | ${undefined} | ${'11'} | ${'11'}
- ${'10'} | ${'pin'} | ${undefined} | ${'stable'} | ${'11'}
+ ${'10'} | ${'pin'} | ${undefined} | ${'stable'} | ${'12'}
${'10'} | ${'pin'} | ${undefined} | ${'bullseye'} | ${'11'}
`(
'getNewValue("$currentValue", "$rangeStrategy", "$currentVersion", "$newVersion") === "$expected"',
@@ -403,12 +404,12 @@ describe('modules/versioning/debian/index', () => {
${'10'} | ${'buster'} | ${0}
${'6'} | ${'squeeze'} | ${0}
${'buster'} | ${'10'} | ${0}
- ${'oldoldstable'} | ${'8'} | ${1}
+ ${'oldoldstable'} | ${'9'} | ${1}
${'oldstable'} | ${'oldoldstable'} | ${1}
${'stable'} | ${'oldstable'} | ${1}
- ${'11'} | ${'oldoldstable'} | ${2}
- ${'10'} | ${'oldstable'} | ${0}
- ${'9'} | ${'stable'} | ${-2}
+ ${'12'} | ${'oldoldstable'} | ${2}
+ ${'11'} | ${'oldstable'} | ${0}
+ ${'10'} | ${'stable'} | ${-2}
`('debian.sortVersions($a, $b) === $expected ', ({ a, b, expected }) => {
expect(debian.sortVersions(a, b)).toEqual(expected);
});