Merge branch 'topic/timw/fix-catalina'

* topic/timw/fix-catalina:
  Use xcode 11 on the Catalina CI image
This commit is contained in:
Tim Wojtulewicz 2021-01-14 11:57:48 -07:00
commit 49ca8e2163
3 changed files with 5 additions and 2 deletions

View file

@ -186,7 +186,7 @@ macos_big_sur_task:
macos_catalina_task:
osx_instance:
image: catalina-base
image: catalina-xcode-11.6
prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE

View file

@ -1,3 +1,6 @@
4.1.0-dev.74 | 2021-01-14 11:57:48 -0700
* Use xcode 11 on the Catalina CI image (Tim Wojtulewicz, Corelight)
4.1.0-dev.71 | 2021-01-11 18:03:25 -0800

View file

@ -1 +1 @@
4.1.0-dev.71
4.1.0-dev.74