Merge remote-tracking branch 'origin/topic/timw/update-freebsd-ci-tasks'

* origin/topic/timw/update-freebsd-ci-tasks:
  CI: remove FreeBSD 13.0, update FreeBSD 12 to 12.3
This commit is contained in:
Tim Wojtulewicz 2022-09-09 09:37:48 -07:00
commit 7c8b6a42bc
3 changed files with 7 additions and 13 deletions

View file

@ -267,20 +267,10 @@ freebsd14_task:
<< : *CI_TEMPLATE
<< : *FREEBSD_ENVIRONMENT
freebsd13_1_task:
freebsd_instance:
# FreeBSD 13.1 EOL: TBD (13.2 + 3 months)
image_family: freebsd-13-1
<< : *FREEBSD_RESOURCES_TEMPLATE
prepare_script: ./ci/freebsd/prepare.sh
<< : *CI_TEMPLATE
<< : *FREEBSD_ENVIRONMENT
freebsd13_task:
freebsd_instance:
# FreeBSD 13 EOL: January 31, 2026
image_family: freebsd-13-0
image_family: freebsd-13-1
<< : *FREEBSD_RESOURCES_TEMPLATE
prepare_script: ./ci/freebsd/prepare.sh
@ -290,7 +280,7 @@ freebsd13_task:
freebsd12_task:
freebsd_instance:
# FreeBSD 12 EOL: June 30, 2024
image_family: freebsd-12-2
image_family: freebsd-12-3
<< : *FREEBSD_RESOURCES_TEMPLATE
prepare_script: ./ci/freebsd/prepare.sh

View file

@ -1,3 +1,7 @@
5.1.0-dev.500 | 2022-09-09 09:37:48 -0700
* CI: remove FreeBSD 13.0, update FreeBSD 12 to 12.3 (Tim Wojtulewicz, Corelight)
5.1.0-dev.497 | 2022-09-07 14:31:07 +0200
* GH-2289: parse.y/directives: Reject directives as statements (Arne Welzel, Corelight)

View file

@ -1 +1 @@
5.1.0-dev.497
5.1.0-dev.500