diff --git a/.cirrus.yml b/.cirrus.yml index cd7a541d71..e2cd173550 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -161,6 +161,13 @@ debian9_32bit_task: << : *RESOURCES_TEMPLATE << : *CI_TEMPLATE +opensuse_leap_15_2_task: + container: + # Opensuse Leap 15.2 EOL: Dec 2021 + dockerfile: ci/opensuse-leap-15.2/Dockerfile + << : *RESOURCES_TEMPLATE + << : *CI_TEMPLATE + ubuntu20_task: container: # Ubuntu 20.04 EOL: April 2025 diff --git a/CHANGES b/CHANGES index f824108e5f..6c339b6202 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,21 @@ +4.1.0-dev.447 | 2021-03-31 09:55:05 -0700 + + * CI: Add OpenSUSE Leap 15.2 (Johanna Amann, Corelight) + + * Add CI task for Alpine Linux (Jon Siwek, Corelight) + + * Separate stdout from stderr in btest baselines (Jon Siwek, Corelight) + + Redirecting both to the same file can show platform-specific differences + (e.g. Alpine), likely due to different buffering defaults. + + * Remove newline-eof canonification attempt in diff-remove-timestamps (Jon Siwek, Corelight) + + * Change a include to (Jon Siwek, Corelight) + + Some systems (e.g. Alpine) may warn that that the former is incorrect. + 4.1.0-dev.440 | 2021-03-30 14:57:07 -0700 * Fix incomplete-type for struct timeval (Andrew Benson) diff --git a/VERSION b/VERSION index 4a06c19f3c..6dde708b58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.440 +4.1.0-dev.447 diff --git a/ci/opensuse-leap-15.2/Dockerfile b/ci/opensuse-leap-15.2/Dockerfile new file mode 100644 index 0000000000..7b23204cde --- /dev/null +++ b/ci/opensuse-leap-15.2/Dockerfile @@ -0,0 +1,25 @@ +FROM opensuse/leap:15.2 + +RUN zypper in -y \ + cmake \ + make \ + gcc \ + gcc-c++ \ + python3 \ + python3-devel \ + flex \ + bison \ + libpcap-devel \ + libopenssl-devel \ + zlib-devel \ + swig \ + git \ + curl \ + python3-pip \ + which \ + gzip \ + tar \ + && rm -rf /var/cache/zypp + + +RUN pip3 install junit2html