From f9c5ee5a9f674f7287ebbc4787f5aec5ebf06555 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Fri, 22 Nov 2024 08:20:17 +1100
Subject: [PATCH] Reapply "11.5 EOL"
This reverts commit 48de289b90fdd82166dda66e0fa616b7acce8dac.
---
update.sh | 2 --
versions.json | 56 ---------------------------------------------------
2 files changed, 58 deletions(-)
diff --git a/update.sh b/update.sh
index 9706f78..331bda8 100755
--- a/update.sh
+++ b/update.sh
@@ -55,8 +55,6 @@ update_version()
sed -e '/collation-server/d' docker.cnf > "$dir/docker.cnf"
if [[ $version != 11.4 ]]; then
sed -i -e '/character-set-collations/d' "$dir/docker.cnf"
- fi
- if [[ $version != 11.[45] ]]; then
sed -i -e '/character-set/d' "$dir/docker.cnf"
fi
fi
diff --git a/versions.json b/versions.json
index c25e533..5facecf 100644
--- a/versions.json
+++ b/versions.json
@@ -110,61 +110,5 @@
"ppc64le",
"s390x"
]
- },
- "11.5": {
- "milestone": "11.5",
- "version": "11.5.2",
- "fullVersion": "1:11.5.2+maria~ubu2404",
- "releaseStatus": "Stable",
- "supportType": "Short Term Support",
- "base": "ubuntu:noble",
- "arches": [
- "amd64",
- "arm64v8",
- "ppc64le",
- "s390x"
- ]
- },
- "11.5-ubi": {
- "milestone": "11.5",
- "version": "11.5.2",
- "fullVersion": "11.5.2",
- "releaseStatus": "Stable",
- "supportType": "Short Term Support",
- "base": "ubi9",
- "arches": [
- "amd64",
- "arm64v8",
- "ppc64le",
- "s390x"
- ]
- },
- "11.6": {
- "milestone": "11.6",
- "version": "11.6.1",
- "fullVersion": "1:11.6.1+maria~ubu2404",
- "releaseStatus": "RC",
- "supportType": "Short Term Support",
- "base": "ubuntu:noble",
- "arches": [
- "amd64",
- "arm64v8",
- "ppc64le",
- "s390x"
- ]
- },
- "11.6-ubi": {
- "milestone": "11.6",
- "version": "11.6.1",
- "fullVersion": "11.6.1",
- "releaseStatus": "RC",
- "supportType": "Short Term Support",
- "base": "ubi9",
- "arches": [
- "amd64",
- "arm64v8",
- "ppc64le",
- "s390x"
- ]
}
}
--
GitLab