diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67a147a42..15140009d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -240,34 +240,34 @@ jobs: instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-24", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' - debian-11: - name: Debian 11 + debian-12: + name: Debian 12 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' uses: ./.github/workflows/test-linux.yml needs: - lint - generate-actions-workflow with: - distro-slug: debian-11 - display-name: Debian 11 - container-slug: debian-11 + distro-slug: debian-12 + display-name: Debian 12 + container-slug: debian-12 timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-24", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' + instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' - debian-12: - name: Debian 12 + debian-13: + name: Debian 13 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' uses: ./.github/workflows/test-linux.yml needs: - lint - generate-actions-workflow with: - distro-slug: debian-12 - display-name: Debian 12 - container-slug: debian-12 + distro-slug: debian-13 + display-name: Debian 13 + container-slug: debian-13 timeout: 20 - instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "git-master", "latest", "default"]' + instances: '["stable-3006", "onedir-3006", "stable-3006-24", "stable-3007", "onedir-3007", "stable-3007-1", "stable-3008", "git-3008", "onedir-3008", "latest", "default"]' photon-5: @@ -361,8 +361,8 @@ jobs: - altlinux-11 - amazonlinux-2023 - archlinux - - debian-11 - debian-12 + - debian-13 - photon-5 - rockylinux-8 - rockylinux-9 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 8c0efa442..4e10b9ee1 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -10,7 +10,6 @@ os.chdir(os.path.abspath(os.path.dirname(__file__))) # "amazonlinux-2", -# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -20,8 +19,8 @@ "altlinux-11", "amazonlinux-2023", "archlinux", - "debian-11", "debian-12", + "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -40,7 +39,6 @@ ] # "amazonlinux-2", -# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -50,8 +48,8 @@ "altlinux-11", "amazonlinux-2023", "archlinux", - "debian-11", "debian-12", + "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -60,7 +58,6 @@ ] # "amazonlinux-2", -# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -70,8 +67,8 @@ "altlinux-11", "amazonlinux-2023", "archlinux", - "debian-11", "debian-12", + "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -116,7 +113,6 @@ "altlinux-11", "amazonlinux-2", "amazonlinux-2023", - "debian-11", "debian-12", "debian-13", "fedora-40", @@ -132,7 +128,6 @@ BLACKLIST_GIT_3007 = [ "amazonlinux-2", "amazonlinux-2023", - "debian-11", "debian-13", "fedora-40", "photon-4", @@ -225,7 +220,6 @@ "amazonlinux-2": "Amazon 2", "amazonlinux-2023": "Amazon 2023", "archlinux": "Arch Linux", - "debian-11": "Debian 11", "debian-12": "Debian 12", "debian-13": "Debian 13", "fedora-40": "Fedora 40", @@ -249,7 +243,6 @@ "amazonlinux-2": "amazonlinux-2", "amazonlinux-2023": "amazonlinux-2023", "archlinux": "archlinux", - "debian-11": "debian-11", "debian-12": "debian-12", "debian-13": "debian-13", "fedora-40": "fedora-40", diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 70f0f0957..272fbdf78 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1618,8 +1618,9 @@ __debian_codename_translation() { __check_end_of_life_versions() { case "${DISTRO_NAME_L}" in debian) - # Debian versions below 11 are not supported - if [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then + # Debian 11 (bullseye) reached end of LTS support on 2026-08-31. + # See: https://www.debian.org/releases/bullseye/ + if [ "$DISTRO_MAJOR_VERSION" -lt 12 ]; then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://wiki.debian.org/DebianReleases"