Date: Wed, 15 Nov 2023 22:13:45 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 3fd60a6b73ac - main - awk: Merge upstream 2nd Edition Awk Book Message-ID: <FEFB35D3-8C1E-4D78-A526-E56050B1B7E5@freebsd.org> In-Reply-To: <CANCZdfq6tWv9skfuA2DAo6AEhJGgFJzVzdWTx3pW8eMaSk-GpQ@mail.gmail.com> References: <202311140451.3AE4p5AR014207@gitrepo.freebsd.org> <C3D101D8-77BB-4250-B934-18C711BADE46@freebsd.org> <CANCZdfq6tWv9skfuA2DAo6AEhJGgFJzVzdWTx3pW8eMaSk-GpQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 15 Nov 2023, at 21:59, Warner Losh <imp@bsdimp.com> wrote: >=20 >=20 >=20 > On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke = <jrtc27@freebsd.org> wrote: >> On 14 Nov 2023, at 04:51, Warner Losh <imp@FreeBSD.org> wrote: >> >=20 >> > The branch main has been updated by imp: >> >=20 >> > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f173970f= ae4cae73 >> >=20 >> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73 >> > Merge: 194df014feeb 2e406c584fe4 >> > Author: Warner Losh <imp@FreeBSD.org> >> > AuthorDate: 2023-11-02 16:32:01 +0000 >> > Commit: Warner Losh <imp@FreeBSD.org> >> > CommitDate: 2023-11-14 04:49:34 +0000 >> >=20 >> > awk: Merge upstream 2nd Edition Awk Book >> >=20 >> > Merge in the November 2nd, 2023 version of one true awk. >> >=20 >> > This brings in Unicode support, CSV support and a number of bug = fixes. >> >=20 >> > Sponsored by: Netflix >> > Reviewed by: delphij >> > Differential Revision: https://reviews.freebsd.org/D42447 >>=20 >> This seems to have broken the GitHub CI for cross-building; contrast: >>=20 >> https://github.com/freebsd/freebsd-src/actions/runs/6859373313 >>=20 >> with: >>=20 >> https://github.com/freebsd/freebsd-src/actions/runs/6859316228 >>=20 >> Has this broken makeobjops.awk somehow? If so it should be = reproducible >> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an = updated >> system. Cross-building will just show it first because we always >> bootstrap awk there, like many other tools. >=20 > It worked when it was the system awk for me... But that might not be = the most > helpful observation. For a clean kernel build? > Why didn't it work for you/github's ci runs? =46rom GitHub (indentation sadly lost when copying): > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam.c:45:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam_ccb.h:1052:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/cam/mmc/mmc_bus.h:4:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/dev/mmc/bridge.h:57:=20 > In file included from = /Users/runner/work/freebsd-src/freebsd-src/sys/sys/bus.h:787:=20 > ./bus_if.h:217:35: error: expected ')'=20 > int _unit);=20 > ^=20 > ./bus_if.h:216:33: note: to match this '('=20 > typedef device_t bus_add_child_t(device_t _dev, u_int _order, const = char *_name=20 > ^=20 > ./bus_if.h:241:41: error: expected ')'=20 > const char *_name, int _unit)=20 > ^=20 > ./bus_if.h:240:39: note: to match this '('=20 > static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order=20 > ^ > ... Hence the assumption that makeobjops.awk has stopped working properly, which is highly consistent with this being the first commit to fail in CI. It looks like we=E2=80=99re missing commas, maybe from format_line. I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s = across all macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t. > makeobjops.awk doesn't have any of the issues that I know are minor = changes > in awk. I'll add it to the list of things to look into, though. On what timeline? If not soon, can we please revert the import as it=E2=80= =99s breaking important things and thus not ready for the tree? Jess > I also broke the Jenkins CI run, but not 'make check' for reasons I = don't > understand. >=20 > Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?FEFB35D3-8C1E-4D78-A526-E56050B1B7E5>