From 5309b6cb932881b2de47884eea451cefb156833d Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 2 Jan 2024 07:48:27 +0000 Subject: [PATCH] Remove eol 12 2023 --- .gitlab-ci-build.yml.in | 1 + distros/fedora/supports.yml | 4 ++-- distros/nixos/supports.yml | 4 ++-- lib/distro.py | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in index 759c732..c652e2f 100644 --- a/.gitlab-ci-build.yml.in +++ b/.gitlab-ci-build.yml.in @@ -31,6 +31,7 @@ stages: - ${tag} variables: &variables PACKER_CONFIG_DIR: ./packer_config/ + PACKER_CACHE_DIR: ./packer_cache/ PACKER_LOG: 0 COMMAND: > packer build ${only} diff --git a/distros/fedora/supports.yml b/distros/fedora/supports.yml index 05ca9e5..295db47 100644 --- a/distros/fedora/supports.yml +++ b/distros/fedora/supports.yml @@ -1,4 +1,5 @@ -37: &supp +37: # EOL +38: &supp - arch: amd64 provider: qemu - arch: amd64 @@ -7,7 +8,6 @@ provider: vmware-iso - arch: amd64 provider: hyperv-iso -38: *supp 39: *supp rawhide: - arch: amd64 diff --git a/distros/nixos/supports.yml b/distros/nixos/supports.yml index 059cb52..d6edc34 100644 --- a/distros/nixos/supports.yml +++ b/distros/nixos/supports.yml @@ -1,4 +1,5 @@ -23.05: &supp +23.05: # EOL +23.11: &supp - arch: amd64 provider: qemu - arch: amd64 @@ -7,4 +8,3 @@ provider: vmware-iso - arch: amd64 provider: hyperv-iso -23.11: *supp diff --git a/lib/distro.py b/lib/distro.py index 30de90f..bd3bdfa 100644 --- a/lib/distro.py +++ b/lib/distro.py @@ -7,6 +7,8 @@ class Distro: self.name = name self.builds = [] for version, matrix in support.items(): + if not matrix: + continue for support in matrix: provider = Provider(support["provider"], support["arch"]) build = Build(self.name, version, provider)