Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/johanna/more-ci-removals'
Browse files Browse the repository at this point in the history
* origin/topic/johanna/more-ci-removals:
  Remove outdated distributions from CI.
  • Loading branch information
0xxon committed Jan 19, 2023
2 parents b4cb5e7 + 12dd21c commit 593ad25
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 125 deletions.
20 changes: 1 addition & 19 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,11 @@ debian10_task:

opensuse_leap_15_4_task:
container:
# Opensuse Leap 15.4 EOL: TBD
# Opensuse Leap 15.4 EOL: ~Nov 2023
dockerfile: ci/opensuse-leap-15.4/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE

opensuse_leap_15_3_task:
container:
# Opensuse Leap 15.3 EOL: ~Dec 2022
dockerfile: ci/opensuse-leap-15.3/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE

opensuse_tumbleweed_task:
container:
# Opensuse Tumbleweed has no EOL
Expand Down Expand Up @@ -307,17 +300,6 @@ freebsd12_task:
<< : *CI_TEMPLATE
<< : *FREEBSD_ENVIRONMENT

# This can be removed as soon as the first distribution that we use ships
# OpenSSL 3.0
openssl30_task:
container:
# Tweaked Ubuntu 20.04 EOL: April 2025
dockerfile: ci/openssl-3.0/Dockerfile
<< : *RESOURCES_TEMPLATE
<< : *CI_TEMPLATE
env:
ZEEK_CI_CONFIGURE_FLAGS: *OPENSSL30_CONFIG

asan_sanitizer_task:
container:
# Just uses a recent/common distro to run memory error/leak checks.
Expand Down
31 changes: 0 additions & 31 deletions ci/fedora-35/Dockerfile

This file was deleted.

41 changes: 0 additions & 41 deletions ci/openssl-3.0/Dockerfile

This file was deleted.

34 changes: 0 additions & 34 deletions ci/opensuse-leap-15.3/Dockerfile

This file was deleted.

0 comments on commit 593ad25

Please sign in to comment.