From 3302923665723d7cff5237007979bc76bbc6bce5 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Wed, 23 Jun 2021 10:59:56 -0400 Subject: Add Alpine 3.14 to CI. (#11270) And remove EOL Alpine 3.10. --- .github/workflows/build-and-install.yml | 8 ++++---- .github/workflows/updater.yml | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml index fc94fc8ae4..3961d7b268 100644 --- a/.github/workflows/build-and-install.yml +++ b/.github/workflows/build-and-install.yml @@ -29,10 +29,10 @@ jobs: matrix: distro: - 'alpine:edge' + - 'alpine:3.14' - 'alpine:3.13' - 'alpine:3.12' - 'alpine:3.11' - - 'alpine:3.10' - 'archlinux:latest' - 'centos:8' - 'centos:7' @@ -53,6 +53,9 @@ jobs: - distro: 'alpine:edge' pre: 'apk add -U bash' rmjsonc: 'apk del json-c-dev' + - distro: 'alpine:3.14' + pre: 'apk add -U bash' + rmjsonc: 'apk del json-c-dev' - distro: 'alpine:3.13' pre: 'apk add -U bash' rmjsonc: 'apk del json-c-dev' @@ -62,9 +65,6 @@ jobs: - distro: 'alpine:3.11' pre: 'apk add -U bash' rmjsonc: 'apk del json-c-dev' - - distro: 'alpine:3.10' - pre: 'apk add -U bash' - rmjsonc: 'apk del json-c-dev' - distro: 'archlinux:latest' pre: 'pacman --noconfirm -Syu && pacman --noconfirm -Sy grep libffi' diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 2da71de6cd..eb86f048c3 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -19,8 +19,9 @@ jobs: max-parallel: 8 matrix: distro: - - 'alpine:3.12' + - 'alpine:3.14' - 'alpine:3.13' + - 'alpine:3.12' - 'archlinux:latest' - 'centos:7' - 'centos:8' @@ -35,10 +36,12 @@ jobs: - 'ubuntu:20.10' - 'ubuntu:21.04' include: - - distro: 'alpine:3.12' + - distro: 'alpine:3.14' pre: 'apk add -U bash' - distro: 'alpine:3.13' pre: 'apk add -U bash' + - distro: 'alpine:3.12' + pre: 'apk add -U bash' - distro: 'debian:9' pre: 'apt-get update' - distro: 'debian:10' -- cgit v1.2.3