On Tue, Jun 22, 2021 at 12:50:33PM +0200, Martin Kletzander wrote: > On Wed, Jun 16, 2021 at 06:21:00AM -0700, Andrea Bolognani wrote: > > On Tue, Jun 15, 2021 at 12:43:39PM +0200, Martin Kletzander wrote: > > > ci: Also perform `brew upgrade` on MacOS > > > > s/MacOS/macOS/ > > > > But see below for why we might have to change the subject even > > further. > > > > > @Andrea: if you have a good explanation you'd like to put in the commit message, > > > I'd me glad to add it (or you can do that as well). Thanks > > > > I think something like > > > > The base OS image might include outdated contents, and we don't > > want to get spurious failures caused by bugs that have already been > > fixed in the respective packages. > > > > This is particularly important on macOS, because 'brew install foo' > > will fail if 'foo' is already installed but outdated: upgrading all > > packages first ensures we never run into this scenario. > > > > would about sum it up. > > > > > @@ -443,6 +444,7 @@ x64-macos-11-build: > > > CIRRUS_VM_IMAGE_SELECTOR: image > > > CIRRUS_VM_IMAGE_NAME: big-sur-base > > > UPDATE_COMMAND: brew update > > > + UPGRADE_COMMAND: brew upgrade > > > > I believe you also need to add > > > > UPGRADE_COMMAND: pkg upgrade -y > > > > to the FreeBSD jobs: I don't think Cirrus CI would appreciate having > > a completely empty string in the list of commands it's supposed to > > run. > > It does not cause any issues on libnbd setup where the upgrade is run > only on macOS. Good that Cirrus CI is handling the situation gracefully! Still it doesn't feel quite right to perform a full system upgrade on macOS, as well as part of the Linux container build process, but not on FreeBSD, does it? > Are you suggesting that I add the `pkg upgrade -y` to FreeBSDs as well > here? Yes. > Because then the commit message would not fit the patch. How so? AFAICT you just need to tweak the subject - the commit message I suggested still applies just fine after you add the 'pkg upgrade' call. -- Andrea Bolognani / Red Hat / Virtualization
