diff --git a/.cirrus.yml b/.cirrus.yml index 55ae4894ba..f93b7f1f79 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -178,14 +178,14 @@ ubuntu16_task: # Apple doesn't publish official long-term support timelines. # We aim to support both the current and previous macOS release. macos_big_sur_task: - osx_instance: + macos_instance: image: big-sur-base prepare_script: ./ci/macos/prepare.sh << : *CI_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE macos_catalina_task: - osx_instance: + macos_instance: image: catalina-xcode-11.6 prepare_script: ./ci/macos/prepare.sh << : *CI_TEMPLATE diff --git a/CHANGES b/CHANGES index 7e031b009a..c58792e1f3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ + +4.1.0-dev.120 | 2021-01-19 21:08:11 -0800 + + * Update Cirrus CI naming for MacOS images (Christian Kreibich, Corelight) + + The docs on https://cirrus-ci.org/guide/macOS/ changed from + "osx_instance" to "macos_instance", so let's reflect that. + 4.1.0-dev.118 | 2021-01-18 19:14:30 -0700 * Remove superfluous nullptr checks in Val/RecordVal methods (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 9ca7005dcc..e8aa901a0d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.118 +4.1.0-dev.120 diff --git a/auxil/broker b/auxil/broker index 7b4eddcc69..243be045fa 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit 7b4eddcc69d7fb2ce74e825c8913cb72dd73ad14 +Subproject commit 243be045fa11b3d214d8b2d31a077d87ae241cb5 diff --git a/auxil/zeek-archiver b/auxil/zeek-archiver index 49c49193f8..7fe80115aa 160000 --- a/auxil/zeek-archiver +++ b/auxil/zeek-archiver @@ -1 +1 @@ -Subproject commit 49c49193f8869b9bce8dfc992901d7ec60c1d37e +Subproject commit 7fe80115aa159119febc623cec0660774bcae50c