Skip to contentSkip to conversation

Improve FreeBSD and macOS jobs in the Cirrus-CI

PATCH Superseded Thomas Huth 7 participants 22 messages Jul 24, 2020 – Jul 28, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Improve FreeBSD and macOS jobs in the Cirrus-CI

Our configure script does not enable -Werror on macOS and FreeBSD by default yet. That's bad in the CI, since we might miss compiler warnings and thus bugs this way. So after fixing a problem in the configure script in the first patch, we now turn on -Werror here in the second patch. The third patch is just a cosmetical one, since Cirrus-CI seems to upgrade all jobs automatically to Cataline these days.

Thomas Huth (3):
configure: Fix atomic64 test for --enable-werror on macOS cirrus.yml: Compile macOS and FreeBSD with -Werror cirrus.yml: Update the macOS jobs to Catalina

 .cirrus.yml | 12 +++++++-----
 configure   | 10 +++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/3 configure: Fix atomic64 test for --enable-werror on macOS

When using --enable-werror for the macOS builders in the Cirrus-CI, the atomic64 test is currently failing, and config.log shows a bunch of error messages like this:

config-temp/qemu-conf.c:6:7: error: implicit declaration of function '__atomic_load_8' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

  y = __atomic_load_8(&x, 0);
      ^

config-temp/qemu-conf.c:6:7: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]

Seems like these __atomic_*_8 functions are available in one of the libraries there, so that the test links and passes there when not using --enable-werror. But there does not seem to be a valid prototype for them in any of the header files, so that the test fails when using --enable-werror.

Fix it by using the "official" built-in functions instead (see e.g.
https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html).
We are not using the *_8 variants in QEMU anyway.

---
 configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
configure +5 -5
index 4bd80ed507..9eaf501f50 100755
@@ -5919,11 +5919,11 @@ int main(void)
 {
   uint64_t x = 0, y = 0;
 #ifdef __ATOMIC_RELAXED
-  y = __atomic_load_8(&x, 0);
-  __atomic_store_8(&x, y, 0);
-  __atomic_compare_exchange_8(&x, &y, x, 0, 0, 0);
-  __atomic_exchange_8(&x, y, 0);
-  __atomic_fetch_add_8(&x, y, 0);
+  y = __atomic_load_n(&x, __ATOMIC_RELAXED);
+  __atomic_store_n(&x, y, __ATOMIC_RELAXED);
+  __atomic_compare_exchange_n(&x, &y, x, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+  __atomic_exchange_n(&x, y, __ATOMIC_RELAXED);
+  __atomic_fetch_add(&x, y, __ATOMIC_RELAXED);
 #else
   typedef char is_host64[sizeof(void *) >= sizeof(uint64_t) ? 1 : -1];
   __sync_lock_test_and_set(&x, y);
Signature · 1 line
2.18.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] configure: Fix atomic64 test for --enable-werror on macOS

Quoted 34 lines · On Freitag, 24. Juli 2020 16:32:18 CEST Thomas Huth wrote:

When using --enable-werror for the macOS builders in the Cirrus-CI, the atomic64 test is currently failing, and config.log shows a bunch of error messages like this:

config-temp/qemu-conf.c:6:7: error: implicit declaration of function '__atomic_load_8' is invalid in C99

[-Werror,-Wimplicit-function-declaration] y = __atomic_load_8(&x, 0);
      ^

config-temp/qemu-conf.c:6:7: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]

Seems like these __atomic_*_8 functions are available in one of the libraries there, so that the test links and passes there when not using --enable-werror. But there does not seem to be a valid prototype for them in any of the header files, so that the test fails when using --enable-werror.

Fix it by using the "official" built-in functions instead (see e.g.
https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html).
We are not using the *_8 variants in QEMU anyway.

---
 configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
configure +0 -0
index 4bd80ed507..9eaf501f50 100755
@@ -5919,11 +5919,11 @@ int main(void)
 {
   uint64_t x = 0, y = 0;

configure int main(void) · line 5925

Quoted 10 lines
configure +3 -5
 #ifdef __ATOMIC_RELAXED
-  y = __atomic_load_8(&x, 0);
-  __atomic_store_8(&x, y, 0);
-  __atomic_compare_exchange_8(&x, &y, x, 0, 0, 0);
-  __atomic_exchange_8(&x, y, 0);
-  __atomic_fetch_add_8(&x, y, 0);
+  y = __atomic_load_n(&x, __ATOMIC_RELAXED);
+  __atomic_store_n(&x, y, __ATOMIC_RELAXED);
+  __atomic_compare_exchange_n(&x, &y, x, 0, __ATOMIC_RELAXED,
 __ATOMIC_RELAXED); +  __atomic_exchange_n(&x, y, __ATOMIC_RELAXED);

Ah right, there is also the __atomic_*_n() variant of these functions. I actually had the more generic variants in mind.

But LGTM and yes, it resolves the warnings on macOS, so ...

configure int main(void) · line 5929

Quoted 4 lines
configure +1 -0
+  __atomic_fetch_add(&x, y, __ATOMIC_RELAXED);
 #else
   typedef char is_host64[sizeof(void *) >= sizeof(uint64_t) ? 1 : -1];
   __sync_lock_test_and_set(&x, y);

Best regards,
Christian Schoenebeck

Reviewed-by Tested-by on v1 1/3
#3 lore raw

Re: [PATCH 1/3] configure: Fix atomic64 test for --enable-werror on macOS

In reply to Thomas Huth
Quoted 17 lines · Thomas Huth

When using --enable-werror for the macOS builders in the Cirrus-CI, the atomic64 test is currently failing, and config.log shows a bunch of error messages like this:

config-temp/qemu-conf.c:6:7: error: implicit declaration of function '__atomic_load_8' is invalid in C99 [-Werror,-Wimplicit-function-declaration]

  y = __atomic_load_8(&x, 0);
      ^

config-temp/qemu-conf.c:6:7: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]

Seems like these __atomic_*_8 functions are available in one of the libraries there, so that the test links and passes there when not using --enable-werror. But there does not seem to be a valid prototype for them in any of the header files, so that the test fails when using --enable-werror.

Quoted 6 lines

Fix it by using the "official" built-in functions instead (see e.g.
https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html).
We are not using the *_8 variants in QEMU anyway.

This also fixes the failure to set CONFIG_ATOMIC64 for clang (9 and others) which didn't fail on my box but was certainly missing.

Signature · 1 line
Alex Bennée
#4 lore raw

PATCH 2/3 cirrus.yml: Compile macOS and FreeBSD with -Werror

In reply to Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.
For macOS, that unfortunately means that we have to disable the vnc-sasl feature, since this is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings.

---
 .cirrus.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
.cirrus.yml +5 -3
index f287d23c5b..bb25c1723b 100644
@@ -12,7 +12,7 @@ freebsd_12_task:
   script:
     - mkdir build
     - cd build
-    - ../configure || { cat config.log; exit 1; }
+    - ../configure --enable-werror || { cat config.log; exit 1; }
     - gmake -j8
     - gmake V=1 check
 
@@ -24,7 +24,8 @@ macos_task:
   script:
     - mkdir build
     - cd build
-    - ../configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
+    - ../configure --python=/usr/local/bin/python3 --disable-vnc-sasl
+        --enable-werror || { cat config.log; exit 1; }
     - gmake -j$(sysctl -n hw.ncpu)
     - gmake check
 
@@ -37,6 +38,7 @@ macos_xcode_task:
   script:
     - mkdir build
     - cd build
-    - ../configure --cc=clang || { cat config.log; exit 1; }
+    - ../configure --cc=clang --disable-vnc-sasl --enable-werror
+        || { cat config.log; exit 1; }
     - gmake -j$(sysctl -n hw.ncpu)
     - gmake check
Signature · 1 line
2.18.1
#5 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 6 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.
For macOS, that unfortunately means that we have to disable the vnc-sasl feature, since this is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings.

I wonder if its possible to add

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated"

...

#pragma GCC diagnostic pop

to silence just one source file ?

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#6 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 10 lines · Daniel P. Berrangé
Quoted 6 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.
For macOS, that unfortunately means that we have to disable the vnc-sasl feature, since this is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings.

I wonder if its possible to add

Quoted 8 lines

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated"

...

#pragma GCC diagnostic pop

to silence just one source file ?

3 years ago Peter said:

"The awkward part is
that it has to be in force at the point where the deprecated function is used, not where it's declared. So you can't just wrap the #include of the ssl header in pragmas, you'd have to either do it at every callsite or else over the whole .c file."

https://www.mail-archive.com/[email protected]/msg459264.html

I guess we were expecting the distrib to update the pkg.

Quoted 5 lines

Regards,
Daniel

#7 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 20 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Daniel P. Berrangé
Quoted 6 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.
For macOS, that unfortunately means that we have to disable the vnc-sasl feature, since this is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings.

I wonder if its possible to add

Quoted 8 lines

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated"

...

#pragma GCC diagnostic pop

to silence just one source file ?

Quoted 7 lines

3 years ago Peter said:

"The awkward part is
that it has to be in force at the point where the deprecated function is used, not where it's declared. So you can't just wrap the #include of the ssl header in pragmas, you'd have to either do it at every callsite or else over the whole .c file."

Nearly all our sasl code is isolated in ui/vnc-auth-sasl.c, so we can just do pragma push/pop around that entire file.

There's then just two remaining cases in ui/vnc.c which are easy enough to deal with, or we can move the calls out of vnc.c into vnc-auth-sasl.c to fully isolate the code

Quoted 11 lines

https://www.mail-archive.com/[email protected]/msg459264.html

I guess we were expecting the distrib to update the pkg.

Quoted 5 lines

Regards,
Daniel

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#8 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 29 lines · Daniel P. Berrangé
Quoted 20 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Daniel P. Berrangé
Quoted 6 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.
For macOS, that unfortunately means that we have to disable the vnc-sasl feature, since this is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings.

I wonder if its possible to add

Quoted 8 lines

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated"

...

#pragma GCC diagnostic pop

to silence just one source file ?

Quoted 7 lines

3 years ago Peter said:

"The awkward part is
that it has to be in force at the point where the deprecated function is used, not where it's declared. So you can't just wrap the #include of the ssl header in pragmas, you'd have to either do it at every callsite or else over the whole .c file."

Quoted 6 lines

Nearly all our sasl code is isolated in ui/vnc-auth-sasl.c, so we can just do pragma push/pop around that entire file.

There's then just two remaining cases in ui/vnc.c which are easy enough to deal with, or we can move the calls out of vnc.c into vnc-auth-sasl.c to fully isolate the code

Sounds like it could be done, indeed. But I wonder whether we really really want to silence the warnings here? We'd hide the information to the users that sasl is apparently disliked by Apple and might get removed on macOS in the future.

Maybe we should rather change the "configure" script to disable sasl by default on macOS unless the user explicitely specified --enable-vnc-sasl ?

Thomas

#9 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 7 lines · Thomas Huth

Sounds like it could be done, indeed. But I wonder whether we really really want to silence the warnings here? We'd hide the information to the users that sasl is apparently disliked by Apple and might get removed on macOS in the future.

Maybe we should rather change the "configure" script to disable sasl by default on macOS unless the user explicitely specified --enable-vnc-sasl ?

Does the Homebrew packaging of QEMU depend on and use a Homebrew packaged sasl, or rely on the system sasl ?

thanks
-- PMM

#10 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 11 lines · Peter Maydell
Quoted 7 lines · Thomas Huth

Sounds like it could be done, indeed. But I wonder whether we really really want to silence the warnings here? We'd hide the information to the users that sasl is apparently disliked by Apple and might get removed on macOS in the future.

Maybe we should rather change the "configure" script to disable sasl by default on macOS unless the user explicitely specified --enable-vnc-sasl ?

Does the Homebrew packaging of QEMU depend on and use a Homebrew packaged sasl, or rely on the system sasl ?

I don't have a Mac, but looking at
https://github.com/Homebrew/homebrew-core/blob/master/Formula/qemu.rb it seems like they don't do anything special with regards to vnc ... so I guess the answer is "they use system sasl" ?

Thomas

#11 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

In reply to Philippe Mathieu-Daudé
Quoted 1 line · Philippe Mathieu-Daudé

I guess we were expecting the distrib to update the pkg.

Apple's view is that you shouldn't be using the sasl header at all but instead their proprietary crypto library APIs, so I wouldn't expect them to ever ship something without the deprecation warnings.

thanks
-- PMM

#12 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 7 lines · On Freitag, 24. Juli 2020 18:50:47 CEST Peter Maydell wrote:
Quoted 1 line · Philippe Mathieu-Daudé

I guess we were expecting the distrib to update the pkg.

Apple's view is that you shouldn't be using the sasl header at all but instead their proprietary crypto library APIs, so I wouldn't expect them to ever ship something without the deprecation warnings.

AFAIK Apple's reason for this is similar to no longer providing headers for OpenSSL [1] (or now actually BoringSSL): they cannot guarantee binary compatibility of these libs beyond individual macOS releases (i.e. without breaking old clients) and bad things happened [2] in the past for apps which expected it would.

[1] https://lists.apple.com/archives/macnetworkprog/2015/Jun/msg00025.html
[2] https://lists.andrew.cmu.edu/pipermail/cyrus-sasl/2007-November/001254.html

The common recommendation is: "Ship your macOS app bundled with the preferred version of these libs."

Best regards,
Christian Schoenebeck

#13 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

In reply to Peter Maydell
Quoted 7 lines · Peter Maydell
Quoted 1 line · Philippe Mathieu-Daudé

I guess we were expecting the distrib to update the pkg.

Apple's view is that you shouldn't be using the sasl header at all but instead their proprietary crypto library APIs, so I wouldn't expect them to ever ship something without the deprecation warnings.

So from pov of our CI, it seems the right answer is to modify the cirrus.yml to install libsasl2 from homebrew:

https://formulae.brew.sh/formula-linux/libsasl2

I presume we might need some env variables (CFLAGS/LDFLAGS) to make configure find this version, in preference to the system version.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#14 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 9 lines · Daniel P. Berrangé
Quoted 7 lines · Peter Maydell
Quoted 1 line · Philippe Mathieu-Daudé

I guess we were expecting the distrib to update the pkg.

Apple's view is that you shouldn't be using the sasl header at all but instead their proprietary crypto library APIs, so I wouldn't expect them to ever ship something without the deprecation warnings.

Quoted 4 lines

So from pov of our CI, it seems the right answer is to modify the cirrus.yml to install libsasl2 from homebrew:

https://formulae.brew.sh/formula-linux/libsasl2

Ok, that one confused me for quite a while, since brew refused to find it in the macOS jobs on Cirrus-CI. The solution: This is not a macOS package, but a Linux package! Homebrew is apparently also available for Linux. There is no libsasl package in homebrew for macOS.

So what to do now? I think introducing a libsasl submodule to QEMU just for compiling this code on macOS without warnings is also overkill. And if I got the answers here right, --disable-sasl is also disliked (since this code likely should still be (compile-)tested on macOS). So I think I'll go for the same trick as Peter is using for his tests and use --extra-cflags='-Werror -Wno-error=deprecated-declarations'.

Thomas

#15 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 13 lines · Thomas Huth
Quoted 12 lines · Daniel P. Berrangé
Quoted 7 lines · Peter Maydell
Quoted 1 line · Philippe Mathieu-Daudé

I guess we were expecting the distrib to update the pkg.

Apple's view is that you shouldn't be using the sasl header at all but instead their proprietary crypto library APIs, so I wouldn't expect them to ever ship something without the deprecation warnings.

So from pov of our CI, it seems the right answer is to modify the cirrus.yml to install libsasl2 from homebrew:

Quoted 6 lines
Quoted 1 line

https://formulae.brew.sh/formula-linux/libsasl2

Ok, that one confused me for quite a while, since brew refused to find it in the macOS jobs on Cirrus-CI. The solution: This is not a macOS package, but a Linux package! Homebrew is apparently also available for Linux. There is no libsasl package in homebrew for macOS.

Hah, I totally missed that too.

Quoted 6 lines

So what to do now? I think introducing a libsasl submodule to QEMU just for compiling this code on macOS without warnings is also overkill. And if I got the answers here right, --disable-sasl is also disliked (since this code likely should still be (compile-)tested on macOS). So I think I'll go for the same trick as Peter is using for his tests and use --extra-cflags='-Werror -Wno-error=deprecated-declarations'.

Seems like despite the deprecation, people just continue to use the system sasl. I guess the extra-cflags is reasonable for CI, and it gives end users a warning that they're relyin on a feature of macOS that's not considered stable....even if it doesn't appear to have had any actual changes for 10 years.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#16 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

In reply to Thomas Huth
Quoted 7 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.
For macOS, that unfortunately means that we have to disable the vnc-sasl feature, since this is marked as deprecated in the macOS headers and thus generates a lot of deprecation warnings.

For my local OSX builds I use --extra-cflags='-Werror -Wno-error=deprecated-declarations' to work around the SASL thing.

thanks
-- PMM

Reviewed-by on v1 2/3
#17 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

In reply to Thomas Huth
Quoted 4 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.

for the FreeBSD change; I'm indifferent on which method is used to address the macos deprecation warnings.

#18 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

Quoted 9 lines · On Sonntag, 26. Juli 2020 18:14:11 CEST Ed Maste wrote:
Quoted 3 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.

for the FreeBSD change; I'm indifferent on which method is used to address the macos deprecation warnings.

Like I pointed out on my response to Peter, it is a bit risky to just blindly link against Apple's version of sasl on macOS. Say you compile qemu on a certain macOS version, then you run qemu again after an update of macOS without recompiling qemu, chances are that you get misbehaviours.

One solution would be bundling the qemu app along with sasl, so qemu would be forced to use that bundled sasl version instead of whatever Apple's version of sasl is installed on the system.

Another appraoch would be checking the system's sasl version on qemu startup by calling either sasl_version() or sasl_version_info() and comparing that with the version qemu was compiled with, and erroring out on doubt.

Or obvious last option: simply taking the risk by ignoring this potential issue. The SASL headers are still made available by Apple, which suggests that they don't break SASL 'too often'.

Your choice. ;-)

Best regards,
Christian Schoenebeck

#19 lore raw

Re: [PATCH 2/3] cirrus.yml: Compile macOS and FreeBSD with -Werror

In reply to Ed Maste
Quoted 10 lines · Ed Maste
Quoted 4 lines · Thomas Huth

Compiler warnings currently go unnoticed in our FreeBSD and macOS builds, since -Werror is only enabled for Linux and MinGW builds by default. So let's enable them here now, too.

for the FreeBSD change; I'm indifferent on which method is used to address the macos deprecation warnings.

Thanks!

I think I'll split the FreeBSD change from the macOS changes, since macOS apparently needs some more work... (I'll have a try with Daniel's suggestion to use libsasl2 from Homebrew there...)

Thomas

#20 lore raw

PATCH 3/3 cirrus.yml: Update the macOS jobs to Catalina

In reply to Thomas Huth

When looking at the CI jobs on cirrus-ci.com, it seems like the mojave-based images have been decomissioned a while ago already, since apparently all our jobs get automatically upgraded to catalina. So let's update our YML script accordingly to avoid confusion.

---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
.cirrus.yml +2 -2
index bb25c1723b..b11aac53cb 100644
@@ -18,7 +18,7 @@ freebsd_12_task:
 
 macos_task:
   osx_instance:
-    image: mojave-base
+    image: catalina-base
   install_script:
     - brew install pkg-config python gnu-sed glib pixman make sdl2 bash
   script:
@@ -32,7 +32,7 @@ macos_task:
 macos_xcode_task:
   osx_instance:
     # this is an alias for the latest Xcode
-    image: mojave-xcode
+    image: catalina-xcode
   install_script:
     - brew install pkg-config gnu-sed glib pixman make sdl2 bash
   script:
Signature · 1 line
2.18.1
Reviewed-by on v1 3/3
#21 lore raw

Re: [PATCH 3/3] cirrus.yml: Update the macOS jobs to Catalina

Quoted 7 lines · Thomas Huth

When looking at the CI jobs on cirrus-ci.com, it seems like the mojave-based images have been decomissioned a while ago already, since apparently all our jobs get automatically upgraded to catalina. So let's update our YML script accordingly to avoid confusion.