From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Jun 2022 06:52:47 +0200 Subject: Merging upstream version 1.35.0. Signed-off-by: Daniel Baumann --- .github/data/distros.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to '.github/data') diff --git a/.github/data/distros.yml b/.github/data/distros.yml index 8d58f4d23..133cdbd13 100644 --- a/.github/data/distros.yml +++ b/.github/data/distros.yml @@ -13,31 +13,38 @@ include: apk add -U bash jsonc_removal: | apk del json-c-dev + - <<: *alpine + version: "3.16" - <<: *alpine version: "3.15" - <<: *alpine version: "3.14" - <<: *alpine version: "3.13" - - <<: *alpine - version: "3.12" - distro: archlinux version: latest env_prep: | pacman --noconfirm -Syu && pacman --noconfirm -Sy grep libffi - - distro: rockylinux - version: "8" - base_image: rockylinux/rockylinux + - &alma + distro: almalinux + version: "9" + base_image: almalinux jsonc_removal: | dnf remove -y json-c-devel - packages: + packages: &alma_packages type: rpm - repo_distro: el/8 + repo_distro: el/9 arches: - amd64 - arm64 + - <<: *alma + version: "8" + packages: + <<: *alma_packages + repo_distro: el/8 + - distro: centos version: "7" packages: @@ -89,11 +96,6 @@ include: packages: <<: *fedora_packages repo_distro: fedora/35 - - <<: *fedora - version: "34" - packages: - <<: *fedora_packages - repo_distro: fedora/34 - &opensuse distro: opensuse -- cgit v1.2.3