Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/christian/osx-macos-renaming'

Browse source 
* origin/topic/christian/osx-macos-renaming:
  Update Cirrus CI naming update for MacOS images
This commit is contained in:
Jon Siwek 2021-01-19 21:08:11 -08:00
commit a98012a8fb
5 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -178,14 +178,14 @@ ubuntu16_task:
# Apple doesn't publish official long-term support timelines. # Apple doesn't publish official long-term support timelines.
# We aim to support both the current and previous macOS release. # We aim to support both the current and previous macOS release.
macos_big_sur_task: macos_big_sur_task:
osx_instance: macos_instance:
image: big-sur-base image: big-sur-base
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE
macos_catalina_task: macos_catalina_task:
osx_instance: macos_instance:
image: catalina-xcode-11.6 image: catalina-xcode-11.6
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE

8
CHANGES
View file

@ -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 4.1.0-dev.118 | 2021-01-18 19:14:30 -0700
* Remove superfluous nullptr checks in Val/RecordVal methods (Jon Siwek, Corelight) * Remove superfluous nullptr checks in Val/RecordVal methods (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.118 4.1.0-dev.120

2
auxil/broker

@ -1 +1 @@
Subproject commit 7b4eddcc69d7fb2ce74e825c8913cb72dd73ad14 Subproject commit 243be045fa11b3d214d8b2d31a077d87ae241cb5

2
auxil/zeek-archiver

@ -1 +1 @@
Subproject commit 49c49193f8869b9bce8dfc992901d7ec60c1d37e Subproject commit 7fe80115aa159119febc623cec0660774bcae50c