Date: Sun, 6 Oct 2024 11:18:15 -0400 From: Adam Weinberger <adamw@adamw.org> To: Ashish SHUKLA <ashish@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 116fd79ff844 - main - lang/go123: Update to 1.23.2 Message-ID: <BCC53211-F707-4E75-91F3-0E1D155A9FB9@adamw.org> In-Reply-To: <D4O7XJGSRSEW.3R96POAAXQJYN@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
> On Oct 5, 2024, at 18:17, Ashish SHUKLA <ashish@freebsd.org> wrote:
>
> On Sun Oct 7, 2024 at 12:04 AM CEST, Adam Weinberger wrote:
>> I’d really like to, but TBH I can’t figure out the right incantation to match the correct ports. If anybody can tell me how to do it correctly, I’d much appreciate it.
>
> While being at the root of my ports clone, and /usr/ports updated (along with
> latest INDEX present), I would use following to bump, and add the
> changes to git index:
>
> # switch to a different branch (to prevent accidents on main branch)
> ❯ git checkout -b bump/go
>
> # bump ports
> ❯ grep -F go123-1.23.1 /usr/ports/INDEX-14 |awk '-F|' '{ print $2; }' | sed -e 's,/usr/ports/,,' -e '/lang\/go123/d' |sort |uniq |xargs -r -n 1 -Ix sh -c 'portedit bump-revision -i x && git add x/Makefile'
>
> # review the changes
> ❯ git diff --cached
>
> # commit the changes
> ❯ git commit ...
>
> # merge the bump/go commit made above to the main branch
> ❯ git checkout main
> ❯ git cherry-pick bump/go
>
> # purge bump/go branch, and push
> ❯ git branch -D bump/go
> ❯ git push origin main
>
>>
>>
>> —
>> Adam Weinberger
>> adamw@adamw.org
>> https://www.adamw.org
>>
>> > On Oct 5, 2024, at 17:58, Ashish SHUKLA <ashish@freebsd.org> wrote:
>> > > On Sat Oct 5, 2024 at 6:16 PM CEST, Adam Weinberger wrote:
>> >> The branch main has been updated by adamw:
>> >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=116fd79ff844c2432f59f1fe970c6954382af827
>> >> >> commit 116fd79ff844c2432f59f1fe970c6954382af827
>> >> Author: Adam Weinberger <adamw@FreeBSD.org>
>> >> AuthorDate: 2024-10-05 16:16:03 +0000
>> >> Commit: Adam Weinberger <adamw@FreeBSD.org>
>> >> CommitDate: 2024-10-05 16:16:03 +0000
>> >> >> lang/go123: Update to 1.23.2
>> > > Are you also planning to bump PORTREVISION of dependent ports ?
>> > > Thanks!
>> > --
>> > Ashish SHUKLA
>> > <signature.asc>
>
> --
> Ashish SHUKLA
> <signature.asc>
Thanks for this! I’ve never used portfmt before, and I was trying to accomplish it with Tools/scripts/bumprevision. The dependent ports are now bumped. Thanks again!
# Adam
—
Adam Weinberger
adamw@adamw.org
https://www.adamw.org
[-- Attachment #2 --]
<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div dir="ltr"><blockquote type="cite">On Oct 5, 2024, at 18:17, Ashish SHUKLA <ashish@freebsd.org> wrote:<br><br></blockquote></div><blockquote type="cite"><div dir="ltr"><span>On Sun Oct 7, 2024 at 12:04 AM CEST, Adam Weinberger wrote:</span><br><blockquote type="cite"><span>I’d really like to, but TBH I can’t figure out the right incantation to match the correct ports. If anybody can tell me how to do it correctly, I’d much appreciate it.</span><br></blockquote><span></span><br><span>While being at the root of my ports clone, and /usr/ports updated (along with</span><br><span>latest INDEX present), I would use following to bump, and add the</span><br><span>changes to git index:</span><br><span></span><br><span># switch to a different branch (to prevent accidents on main branch)</span><br><span>❯ git checkout -b bump/go</span><br><span></span><br><span># bump ports</span><br><span>❯ grep -F go123-1.23.1 /usr/ports/INDEX-14 |awk '-F|' '{ print $2; }' | sed -e 's,/usr/ports/,,' -e '/lang\/go123/d' |sort |uniq |xargs -r -n 1 -Ix sh -c 'portedit bump-revision -i x && git add x/Makefile'</span><br><span></span><br><span># review the changes</span><br><span>❯ git diff --cached</span><br><span></span><br><span># commit the changes</span><br><span>❯ git commit ...</span><br><span></span><br><span># merge the bump/go commit made above to the main branch</span><br><span>❯ git checkout main</span><br><span>❯ git cherry-pick bump/go</span><br><span></span><br><span># purge bump/go branch, and push</span><br><span>❯ git branch -D bump/go</span><br><span>❯ git push origin main</span><br><span></span><br><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>—</span><br></blockquote><blockquote type="cite"><span>Adam Weinberger</span><br></blockquote><blockquote type="cite"><span>adamw@adamw.org</span><br></blockquote><blockquote type="cite"><span>https://www.adamw.org</span><br></blockquote><blockquote type="cite"><span></span><br></blockquote><blockquote type="cite"><span>> On Oct 5, 2024, at 17:58, Ashish SHUKLA <ashish@freebsd.org> wrote:</span><br></blockquote><blockquote type="cite"><span>> > On Sat Oct 5, 2024 at 6:16 PM CEST, Adam Weinberger wrote:</span><br></blockquote><blockquote type="cite"><span>>> The branch main has been updated by adamw:</span><br></blockquote><blockquote type="cite"><span>>> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=116fd79ff844c2432f59f1fe970c6954382af827</span><br></blockquote><blockquote type="cite"><span>>> >> commit 116fd79ff844c2432f59f1fe970c6954382af827</span><br></blockquote><blockquote type="cite"><span>>> Author: Adam Weinberger <adamw@FreeBSD.org></span><br></blockquote><blockquote type="cite"><span>>> AuthorDate: 2024-10-05 16:16:03 +0000</span><br></blockquote><blockquote type="cite"><span>>> Commit: Adam Weinberger <adamw@FreeBSD.org></span><br></blockquote><blockquote type="cite"><span>>> CommitDate: 2024-10-05 16:16:03 +0000</span><br></blockquote><blockquote type="cite"><span>>> >> lang/go123: Update to 1.23.2</span><br></blockquote><blockquote type="cite"><span>> > Are you also planning to bump PORTREVISION of dependent ports ?</span><br></blockquote><blockquote type="cite"><span>> > Thanks!</span><br></blockquote><blockquote type="cite"><span>> --</span><br></blockquote><blockquote type="cite"><span>> Ashish SHUKLA</span><br></blockquote><blockquote type="cite"><span>> <signature.asc></span><br></blockquote><span></span><br><span>--</span><br><span>Ashish SHUKLA</span><br><div><signature.asc></div></div></blockquote><br><div>Thanks for this! I’ve never used portfmt before, and I was trying to accomplish it with Tools/scripts/bumprevision. The dependent ports are now bumped. Thanks again!</div><div><br></div><div># Adam</div><div><br id="lineBreakAtBeginningOfSignature"><div dir="ltr"><br></div><div id="AppleMailSignature" dir="ltr">—<div>Adam Weinberger</div><div>adamw@adamw.org</div><div>https://www.adamw.org</div></div><div dir="ltr"><br style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);"></div></div></body></html>
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BCC53211-F707-4E75-91F3-0E1D155A9FB9>