Date: Thu, 8 Dec 2022 16:58:49 -0700 From: Warner Losh <imp@bsdimp.com> To: Alan Somers <asomers@freebsd.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, Emmanuel Vadot <manu@bidouilliste.com>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 6c93a2d0bc37 - main - [skip ci] improvements to cap_sysctl.3 Message-ID: <CANCZdfpBFwXyuNZ0SkgF-rpyLdJX0J0sAuKKkFJGQi9p_W9ZbQ@mail.gmail.com> In-Reply-To: <CAOtMX2hqSN26BZ_cFzPDwTo06L7aBQApJ0HDGAnAX93zLxB%2B1Q@mail.gmail.com> References: <202212081946.2B8Jk1e8070942@gitrepo.freebsd.org> <20221208221501.4abec4c251863fe23a35ce78@bidouilliste.com> <CAOtMX2jZiGLdmhJ2eX5inFkK3oN-Q3dHwumQLuu6QAXkAVKqdw@mail.gmail.com> <20221208225915.72b1b339de1a7962e3e38c9e@bidouilliste.com> <CAOtMX2i0=cdjJ6ft2oe9s2EV1soiO=kO1dNofDrMdOh=SK-5Cg@mail.gmail.com> <20221208222239.B85D0222@slippy.cwsent.com> <CAOtMX2j42-HOCzigiOLeo=ptM%2BXZwTgh-RSEL8oSj5tZ5N7nVg@mail.gmail.com> <20221208230826.8F960147@slippy.cwsent.com> <CAOtMX2go6qsxxBr-WwRB0Vz-xpNt_pb0XPsWyQo36x23NFeOMg@mail.gmail.com> <20221208233556.9EFACDB@slippy.cwsent.com> <CAOtMX2hqSN26BZ_cFzPDwTo06L7aBQApJ0HDGAnAX93zLxB%2B1Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000002afc2e05ef59d2d0 Content-Type: text/plain; charset="UTF-8" On Thu, Dec 8, 2022, 4:50 PM Alan Somers <asomers@freebsd.org> wrote: > On Thu, Dec 8, 2022 at 4:36 PM Cy Schubert <Cy.Schubert@cschubert.com> > wrote: > > > > In message > <CAOtMX2go6qsxxBr-WwRB0Vz-xpNt_pb0XPsWyQo36x23NFeOMg@mail.gmail.c > > om> > > , Alan Somers writes: > > > On Thu, Dec 8, 2022 at 4:08 PM Cy Schubert <Cy.Schubert@cschubert.com> > wrote: > > > > > > > > In message > <CAOtMX2j42-HOCzigiOLeo=ptM+XZwTgh-RSEL8oSj5tZ5N7nVg@mail.gmail. > > > c > > > > om> > > > > , Alan Somers writes: > > > > > On Thu, Dec 8, 2022 at 3:22 PM Cy Schubert < > Cy.Schubert@cschubert.com> wr > > > ote: > > > > > > > > > > > > In message <CAOtMX2i0=cdjJ6ft2oe9s2EV1soiO=kO1dNofDrMdOh= > SK-5Cg@mail.gm > > > ail. > > > > > c > > > > > > om> > > > > > > , Alan Somers writes: > > > > > > > On Thu, Dec 8, 2022 at 2:59 PM Emmanuel Vadot < > manu@bidouilliste.com> > > > wro > > > > > te: > > > > > > > > > > > > > > > > On Thu, 8 Dec 2022 14:28:34 -0700 > > > > > > > > Alan Somers <asomers@freebsd.org> wrote: > > > > > > > > > > > > > > > > > On Thu, Dec 8, 2022 at 2:15 PM Emmanuel Vadot > <manu@bidouilliste. > > > com> > > > > > wro > > > > > > > te: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Hi Alan, > > > > > > > > > > > > > > > > > > > > On Thu, 8 Dec 2022 19:46:01 GMT > > > > > > > > > > Alan Somers <asomers@FreeBSD.org> wrote: > > > > > > > > > > > > > > > > > > > > > The branch main has been updated by asomers: > > > > > > > > > > > > > > > > > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=6c93a2d0bc37f0c9 > > > 12e4 > > > > > 02f3 > > > > > > > f94c3c01350dca26 > > > > > > > > > > > > > > > > > > > > > > commit 6c93a2d0bc37f0c912e402f3f94c3c01350dca26 > > > > > > > > > > > Author: Alan Somers <asomers@FreeBSD.org> > > > > > > > > > > > AuthorDate: 2022-12-01 16:49:57 +0000 > > > > > > > > > > > Commit: Alan Somers <asomers@FreeBSD.org> > > > > > > > > > > > CommitDate: 2022-12-08 19:45:47 +0000 > > > > > > > > > > > > > > > > > > > > > > [skip ci] improvements to cap_sysctl.3 > > > > > > > > > > > > > > > > > > > > You keep doing commit with this [skip ci] prefix, what > is it f > > > or ? > > > > > > > > > > AFAIK the official FreeBSD CI doesn't support this and > I find > > > that > > > > > > > > > > really ugly to have this in the commit subject. > > > > > > > > > > Mind sharing more on why you add this ? > > > > > > > > > > > > > > > > > > > > Cheers, > > > > > > > > > > > > > > > > > > > > -- > > > > > > > > > > Emmanuel Vadot <manu@bidouilliste.com> <manu@FreeBSD.org > > > > > > > > > > > > > > > > > > > > It tells CI systems not to run any tests on this commit. > Both Ci > > > rrus > > > > > > > > > and Jenkins understand it, among others. For example, if > you bro > > > wse > > > > > > > > > to https://github.com/freebsd/freebsd-src/commits/main > and hover > > > over > > > > > > > > > the green checkmark next to this commit, you'll see a > bunch of > > > > > > > > > "skipped" symbols. So I use it just to save resources. I > think > > > I > > > > > > > > > could put it on a separate line, though. > > > > > > > > > -Alan > > > > > > > > > > > > > > > > Mhm ok, I find that very ugly, couldn't we add some git > push optio > > > ns > > > > > > > > instead ? We use gitlab at current work and we use a lot of > those p > > > ush > > > > > > > > options, this avoid having ugly commit subject. > > > > > > > > > > > > > > > > > > > > > How? What is a "git push option"? > > > > > > > > > > > > > > > > > > > -o <option>, --push-option=<option> > > > > > > Transmit the given string to the server, which passes > them t > > > o th > > > > > e > > > > > > pre-receive as well as the post-receive hook. The > given stri > > > ng > > > > > > must > > > > > > not contain a NUL or LF character. When multiple > > > > > > --push-option=<option> are given, they are all sent > to the o > > > ther > > > > > > side in the order listed on the command line. When no > > > > > > --push-option=<option> is given from the command > line, the v > > > alue > > > > > s > > > > > > of configuration variable push.pushOption are used > instead. > > > > > > > > > > Any idea how to make that work with Cirrus? I don't see anything > > > > > about it in their documentation. > > > > > > > > I may be talking through my hat here but I think this is something > that > > > > needs to be implemented as a commit hook to affect our jenkins CI in > some > > > > way. > > > > > > > > I also don't see how Github workflows has anything to do with our > cgit + > > > > jenkins. > > > > > > Because in addition to Jenkins, we're also running Cirrus CI, > > > triggered by Github. > > > > I would think we'd need a post-push hook to: > > > > a) Cause jenkins to skip testing the commit, AND > > > > b) Add two blank lines plus the skip-checks line as per the GH > documentation > > prior to sending the replicated pushes to GH. > > This part seems like the worst of all. Altering the commit messages > before we push to GH still clutters up the commit messages, and would > also result in the commit messages on GH not matching those on our > private server. Wouldn't that be worse? > Anything that changes the hash is a non-starter. Changing the commit message would do that. Adding a note for the revision wouldn't change the hash. Warner > > > We could even introduce two such push options each affecting jenkins or > GH, > > though I don't think this should be necessary. The nice thing of this is > > that one can put this in their .git/config for a period of time. > > > > Agreed that cluttering commit log subject lines or even messages with GH > > "commands" will make it more difficult for people weeks, months, or years > > down the road searching through the logs bisecting something or another. > > > > I agree with manu that there needs to be better way. > --0000000000002afc2e05ef59d2d0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" = class=3D"gmail_attr">On Thu, Dec 8, 2022, 4:50 PM Alan Somers <<a href= =3D"mailto:asomers@freebsd.org">asomers@freebsd.org</a>> wrote:<br></div= ><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1= px #ccc solid;padding-left:1ex">On Thu, Dec 8, 2022 at 4:36 PM Cy Schubert = <<a href=3D"mailto:Cy.Schubert@cschubert.com" target=3D"_blank" rel=3D"n= oreferrer">Cy.Schubert@cschubert.com</a>> wrote:<br> ><br> > In message <CAOtMX2go6qsxxBr-WwRB0Vz-xpNt_pb0XPsWyQo36x23NFeOMg@mai= l.gmail.c<br> > om><br> > , Alan Somers writes:<br> > > On Thu, Dec 8, 2022 at 4:08 PM Cy Schubert <<a href=3D"mailto:= Cy.Schubert@cschubert.com" target=3D"_blank" rel=3D"noreferrer">Cy.Schubert= @cschubert.com</a>> wrote:<br> > > ><br> > > > In message <CAOtMX2j42-HOCzigiOLeo=3DptM+XZwTgh-RSEL8oSj5= tZ5N7nVg@mail.gmail.<br> > > c<br> > > > om><br> > > > , Alan Somers writes:<br> > > > > On Thu, Dec 8, 2022 at 3:22 PM Cy Schubert <<a href= =3D"mailto:Cy.Schubert@cschubert.com" target=3D"_blank" rel=3D"noreferrer">= Cy.Schubert@cschubert.com</a>> wr<br> > > ote:<br> > > > > ><br> > > > > > In message <CAOtMX2i0=3DcdjJ6ft2oe9s2EV1soiO=3D= kO1dNofDrMdOh=3D<a href=3D"mailto:SK-5Cg@mail.gm" target=3D"_blank" rel=3D"= noreferrer">SK-5Cg@mail.gm</a><br> > > ail.<br> > > > > c<br> > > > > > om><br> > > > > > , Alan Somers writes:<br> > > > > > > On Thu, Dec 8, 2022 at 2:59 PM Emmanuel Vadot= <<a href=3D"mailto:manu@bidouilliste.com" target=3D"_blank" rel=3D"nore= ferrer">manu@bidouilliste.com</a>><br> > >=C2=A0 wro<br> > > > > te:<br> > > > > > > ><br> > > > > > > > On Thu, 8 Dec 2022 14:28:34 -0700<br> > > > > > > > Alan Somers <<a href=3D"mailto:asomer= s@freebsd.org" target=3D"_blank" rel=3D"noreferrer">asomers@freebsd.org</a>= > wrote:<br> > > > > > > ><br> > > > > > > > > On Thu, Dec 8, 2022 at 2:15 PM Emma= nuel Vadot <manu@bidouilliste.<br> > > com><br> > > > >=C2=A0 wro<br> > > > > > > te:<br> > > > > > > > > ><br> > > > > > > > > ><br> > > > > > > > > >=C2=A0 Hi Alan,<br> > > > > > > > > ><br> > > > > > > > > > On Thu, 8 Dec 2022 19:46:01 GM= T<br> > > > > > > > > > Alan Somers <asomers@FreeBS= D.org> wrote:<br> > > > > > > > > ><br> > > > > > > > > > > The branch main has been = updated by asomers:<br> > > > > > > > > > ><br> > > > > > > > > > > URL: <a href=3D"https://c= git.FreeBSD.org/src/commit/?id=3D6c93a2d0bc37f0c9" rel=3D"noreferrer norefe= rrer" target=3D"_blank">https://cgit.FreeBSD.org/src/commit/?id=3D6c93a2d0b= c37f0c9</a><br> > > 12e4<br> > > > > 02f3<br> > > > > > > f94c3c01350dca26<br> > > > > > > > > > ><br> > > > > > > > > > > commit 6c93a2d0bc37f0c912= e402f3f94c3c01350dca26<br> > > > > > > > > > > Author:=C2=A0 =C2=A0 =C2= =A0Alan Somers <asomers@FreeBSD.org><br> > > > > > > > > > > AuthorDate: 2022-12-01 16= :49:57 +0000<br> > > > > > > > > > > Commit:=C2=A0 =C2=A0 =C2= =A0Alan Somers <asomers@FreeBSD.org><br> > > > > > > > > > > CommitDate: 2022-12-08 19= :45:47 +0000<br> > > > > > > > > > ><br> > > > > > > > > > >=C2=A0 =C2=A0 =C2=A0[skip = ci] improvements to cap_sysctl.3<br> > > > > > > > > ><br> > > > > > > > > >=C2=A0 You keep doing commit wi= th this [skip ci] prefix, what is it f<br> > > or ?<br> > > > > > > > > >=C2=A0 AFAIK the official FreeB= SD CI doesn't support this and I find<br> > > that<br> > > > > > > > > > really ugly to have this in th= e commit subject.<br> > > > > > > > > >=C2=A0 Mind sharing more on why= you add this ?<br> > > > > > > > > ><br> > > > > > > > > >=C2=A0 Cheers,<br> > > > > > > > > ><br> > > > > > > > > > --<br> > > > > > > > > > Emmanuel Vadot <<a href=3D"= mailto:manu@bidouilliste.com" target=3D"_blank" rel=3D"noreferrer">manu@bid= ouilliste.com</a>> <manu@FreeBSD.org><br> > > > > > > > ><br> > > > > > > > > It tells CI systems not to run any = tests on this commit.=C2=A0 Both Ci<br> > > rrus<br> > > > > > > > > and Jenkins understand it, among ot= hers.=C2=A0 For example, if you bro<br> > > wse<br> > > > > > > > > to <a href=3D"https://github.com/fr= eebsd/freebsd-src/commits/main" rel=3D"noreferrer noreferrer" target=3D"_bl= ank">https://github.com/freebsd/freebsd-src/commits/main</a>; and hover<br> > > over<br> > > > > > > > > the green checkmark next to this co= mmit, you'll see a bunch of<br> > > > > > > > > "skipped" symbols.=C2=A0 = So I use it just to save resources.=C2=A0 I think<br> > > I<br> > > > > > > > > could put it on a separate line, th= ough.<br> > > > > > > > > -Alan<br> > > > > > > ><br> > > > > > > >=C2=A0 Mhm ok, I find that very ugly, cou= ldn't we add some git push optio<br> > > ns<br> > > > > > > > instead ? We use gitlab at current work = and we use a lot of those p<br> > > ush<br> > > > > > > > options, this avoid having ugly commit s= ubject.<br> > > > > > ><br> > > > > > ><br> > > > > > > How?=C2=A0 What is a "git push option&qu= ot;?<br> > > > > > ><br> > > > > ><br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 -o <option>, --pu= sh-option=3D<option><br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Transmit = the given string to the server, which passes them t<br> > > o th<br> > > > > e<br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 pre-recei= ve as well as the post-receive hook. The given stri<br> > > ng<br> > > > > > must<br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 not conta= in a NUL or LF character. When multiple<br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --push-op= tion=3D<option> are given, they are all sent to the o<br> > > ther<br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 side in t= he order listed on the command line. When no<br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --push-op= tion=3D<option> is given from the command line, the v<br> > > alue<br> > > > > s<br> > > > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 of config= uration variable push.pushOption are used instead.<br> > > > ><br> > > > > Any idea how to make that work with Cirrus?=C2=A0 I don= 't see anything<br> > > > > about it in their documentation.<br> > > ><br> > > > I may be talking through my hat here but I think this is som= ething that<br> > > > needs to be implemented as a commit hook to affect our jenki= ns CI in some<br> > > > way.<br> > > ><br> > > > I also don't see how Github workflows has anything to do= with our cgit +<br> > > > jenkins.<br> > ><br> > > Because in addition to Jenkins, we're also running Cirrus CI,= <br> > > triggered by Github.<br> ><br> > I would think we'd need a post-push hook to:<br> ><br> > a) Cause jenkins to skip testing the commit, AND<br> ><br> > b) Add two blank lines plus the skip-checks line as per the GH documen= tation<br> >=C2=A0 =C2=A0 prior to sending the replicated pushes to GH.<br> <br> This part seems like the worst of all.=C2=A0 Altering the commit messages<b= r> before we push to GH still clutters up the commit messages, and would<br> also result in the commit messages on GH not matching those on our<br> private server.=C2=A0 Wouldn't that be worse?<br></blockquote></div></d= iv><div dir=3D"auto"><br></div><div dir=3D"auto">Anything that changes the = hash is a non-starter. Changing the commit message would do that. Adding a = note for the revision wouldn't change the hash.</div><div dir=3D"auto">= <br></div><div dir=3D"auto">Warner</div><div dir=3D"auto"><br></div><div di= r=3D"auto"><br></div><div dir=3D"auto"><div class=3D"gmail_quote"><blockquo= te class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc so= lid;padding-left:1ex"> ><br> > We could even introduce two such push options each affecting jenkins o= r GH,<br> > though I don't think this should be necessary. The nice thing of t= his is<br> > that one can put this in their .git/config for a period of time.<br> ><br> > Agreed that cluttering commit log subject lines or even messages with = GH<br> > "commands" will make it more difficult for people weeks, mon= ths, or years<br> > down the road searching through the logs bisecting something or anothe= r.<br> ><br> > I agree with manu that there needs to be better way.<br> </blockquote></div></div></div> --0000000000002afc2e05ef59d2d0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpBFwXyuNZ0SkgF-rpyLdJX0J0sAuKKkFJGQi9p_W9ZbQ>