Skip to content

Commit

Permalink
CI updates
Browse files Browse the repository at this point in the history
- Remove Fedora 36 & 37, add 38 & 39
- Remove Ubuntu 18
- Remove macOS Monterey, add Sonoma
- Remove openSUSE Leap 15.4, add 15.5
- Add Debian 12
- Take FreeBSD 14 out of test-only mode, bump 13.1 to 13.2, remove 12
  • Loading branch information
ckreibich committed Dec 14, 2023
1 parent 8fe24f8 commit 736ec8d
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 74 deletions.
60 changes: 23 additions & 37 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@ env:
# Linux EOL timelines: https://linuxlifecycle.com/
# Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle

fedora37_task:
fedora39_task:
container:
# Fedora 37 EOL: Around Dec 2024
dockerfile: ci/fedora-37/Dockerfile
# Fedora 39 EOL: Around Nov 2024
dockerfile: ci/fedora-39/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE

fedora36_task:
fedora38_task:
container:
# Fedora 36 EOL: Around May 2023
dockerfile: ci/fedora-36/Dockerfile
# Fedora 38 EOL: Around May 2024
dockerfile: ci/fedora-38/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR
Expand Down Expand Up @@ -119,12 +119,19 @@ centos7_task:
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR

debian12_task:
container:
# Debian 12 EOL: TBD
dockerfile: ci/debian-12/Dockerfile
<< : *CI_TEMPLATE

debian11_task:
container:
# Debian 11 EOL: June 2026
dockerfile: ci/debian-11/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR

debian11_static_task:
container:
Expand All @@ -143,10 +150,10 @@ debian10_task:
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR

opensuse_leap_15_4_task:
opensuse_leap_15_5_task:
container:
# Opensuse Leap 15.4 EOL: ~Nov 2023
dockerfile: ci/opensuse-leap-15.4/Dockerfile
# Opensuse Leap 15.5 EOL: Around Dec 25
dockerfile: ci/opensuse-leap-15.5/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE

Expand All @@ -173,14 +180,6 @@ ubuntu20_task:
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR

ubuntu18_task:
container:
# Ubuntu 18.04 EOL: April 2023
dockerfile: ci/ubuntu-18.04/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR

alpine_task:
container:
# Alpine releases typically happen every 6 months w/ support for 2 years.
Expand All @@ -192,16 +191,16 @@ alpine_task:

# Apple doesn't publish official long-term support timelines.
# We aim to support both the current and previous macOS release.
macos_ventura_task:
macos_sonoma_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-base:latest
image: ghcr.io/cirruslabs/macos-sonoma-base:latest
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT

macos_monterey_task:
macos_ventura_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest
image: ghcr.io/cirruslabs/macos-ventura-base:latest
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_ENVIRONMENT
Expand All @@ -210,10 +209,8 @@ macos_monterey_task:
# FreeBSD EOL timelines: https://www.freebsd.org/security/#sup
freebsd14_task:
freebsd_instance:
# We don't support FreeBSD 14 yet, this is a purely informative task
image_family: freebsd-14-0-snap
allow_failures: true
skip_notification: true
# FreeBSD 14 EOL: Nov 30 2028
image_family: freebsd-14-0
<< : *FREEBSD_RESOURCES_TEMPLATE

prepare_script: ./ci/freebsd/prepare.sh
Expand All @@ -223,18 +220,7 @@ freebsd14_task:
freebsd13_task:
freebsd_instance:
# FreeBSD 13 EOL: January 31, 2026
image_family: freebsd-13-1
<< : *FREEBSD_RESOURCES_TEMPLATE

prepare_script: ./ci/freebsd/prepare.sh
<< : *CI_TEMPLATE
<< : *SKIP_TASK_ON_PR
<< : *FREEBSD_ENVIRONMENT

freebsd12_task:
freebsd_instance:
# FreeBSD 12 EOL: June 30, 2024
image_family: freebsd-12-3
image_family: freebsd-13-2
<< : *FREEBSD_RESOURCES_TEMPLATE

prepare_script: ./ci/freebsd/prepare.sh
Expand Down
18 changes: 18 additions & 0 deletions ci/debian-12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM debian:12

ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20231213

RUN apt-get update && apt-get -y install \
bison \
cmake \
flex \
g++ \
gcc \
git \
make \
&& apt autoclean \
&& rm -rf /var/lib/apt/lists/*
4 changes: 2 additions & 2 deletions ci/fedora-36/Dockerfile → ci/fedora-38/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM fedora:36
FROM fedora:38

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20220614
ENV DOCKERFILE_VERSION 20231213

RUN dnf -y install \
bison \
Expand Down
4 changes: 2 additions & 2 deletions ci/fedora-37/Dockerfile → ci/fedora-39/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM fedora:37
FROM fedora:39

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20221127
ENV DOCKERFILE_VERSION 20231213

RUN dnf -y install \
bison \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM opensuse/leap:15.4
FROM opensuse/leap:15.5

# A version field to invalidate Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20220615
ENV DOCKERFILE_VERSION 20231213

RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.4:Update/standard/openSUSE:Leap:15.4:Update.repo \
RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.5:Update/standard/openSUSE:Leap:15.5:Update.repo \
&& zypper refresh \
&& zypper in -y \
bison \
Expand Down
30 changes: 0 additions & 30 deletions ci/ubuntu-18.04/Dockerfile

This file was deleted.

0 comments on commit 736ec8d

Please sign in to comment.