On Fri, 30 Dec 2022 at 09:29, Thomas Munro <thomas.mu...@gmail.com> wrote: > > On Wed, Nov 23, 2022 at 11:57 AM Justin Pryzby <pry...@telsasoft.com> wrote: > > [PATCH 02/10] cirrus/macos: switch to "macos_instance" / M1.. > > Duelling patches. > > Bilal's patch[1] uses the matrix feature to run the tests on both > Intel and ARM, which made sense when he proposed it, but according to > Cirrus CI warnings, the Intel instances are about to go away. So I > think we just need your smaller change to switch the instance type. > > As for the pathname change, there is another place that knows where > Homebrew lives, in ldap/001_auth. Fixed in the attached. That test > just SKIPs if it can't find the binary, making it harder to notice. > Standardising our approach here might make sense for a later patch. > As for the kerberos test, Bilal's patch may well be a better idea (it > adds MacPorts for one thing), and so I'll suggest rebasing that, but > here I just wanted the minimum mechanical fix to avoid breaking on the > 1st of Jan. > > I plan to push this soon if there are no objections. Then discussion > of Bilal's patch can continue. > > > [PATCH 03/10] cirrus/macos: update to macos ventura > > I don't know any reason not to push this one too, but it's not time critical.
The patch does not apply on top of HEAD as in [1], please post a rebased patch: === Applying patches on top of PostgreSQL commit ID e351f85418313e97c203c73181757a007dfda6d0 === === applying patch ./0001-ci-Change-macOS-builds-from-Intel-to-ARM.patch patching file .cirrus.yml Hunk #1 FAILED at 407. Hunk #2 FAILED at 428. Hunk #3 FAILED at 475. 3 out of 3 hunks FAILED -- saving rejects to file .cirrus.yml.rej patching file src/test/kerberos/t/001_auth.pl Hunk #1 FAILED at 32. 1 out of 1 hunk FAILED -- saving rejects to file src/test/kerberos/t/001_auth.pl.rej patching file src/test/ldap/t/001_auth.pl Hunk #1 FAILED at 21. 1 out of 1 hunk FAILED -- saving rejects to file src/test/ldap/t/001_auth.pl.rej [1] - http://cfbot.cputube.org/patch_41_3709.log Regards, Vigneh