GNU bug report logs - #73502
Request for merging "go-team" branch

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73502 in the body.
You can then email your comments to 73502 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Christina O'Donnell <cdo <at> mutix.org>,
 Brennan Vincent <brennan <at> umanwizard.com>,
 Efraim Flashner <efraim <at> flashner.co.il>, Troy Figiel <troy <at> troyfigiel.com>,
 guix-devel <at> gnu.org, "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Request for merging "go-team" branch
Date: Thu, 26 Sep 2024 22:11:05 +0100

[Message part 1 (text/plain, inline)]

Hi Guix!

After a few weeks of working on go-team it's ready for the final review
and merge to master.

My target was to update and move packages from (gnu packages golang) to
logical submodules and prepare bare minimal refreshed amount to complete
Prometheus packaging.

* Covered issues

- <https://issues.guix.gnu.org/69827>
  [PATCH 1/3] build-system/go: Add subdir parameter to go-version->git-ref.

- <https://issues.guix.gnu.org/73171>
  [PATCH] gnu: go-1.23: Update to 1.23.1.

- <https://issues.guix.gnu.org/73176>
  [PATCH] gnu: go-1.20: Build with gccgo-12 on some systems.

- <https://issues.guix.gnu.org/73299>
  [PATCH] build/go: Replace symlinks with a copy of the file.

- <https://issues.guix.gnu.org/73184>
[PATCH 0/5] Add some Golang libraries from the "awesome-go" list

- <https://issues.guix.gnu.org/69376>
[PATCH go-team] build-system/go: Allow providing additional test flags.

#69827 may cover/resolve few more:
- <2021-12-07> guix import go error https://issues.guix.gnu.org/52362
  by Stephen Webber <montokapro <at> gmail.com>

- <2023-04-21> Go importer doesn't know MODULE/vX.Y version tags
  https://issues.guix.gnu.org/63001 by Timo Wilken  guix <at> twilken.net

- <2023-05-22> [PATCH 0/2] Fix annoyance with "guix import go"
  https://issues.guix.gnu.org/63647 by Simon Tournier
  <zimon.toutoune <at> gmail.com>

- <2023-06-12> [PATH] fix a bug on importing go packages.
  https://issues.guix.gnu.org/64035,
  https://issues.guix.gnu.org/64036 by Elbek

* Findings and potential refresh blockers

During refresh I've faced with go packages which still include vendor
directory and due to a large packaging efforts requiring to unbundle
them all might need some efforts distribution among volunteers.

Me and Artyom unbundling Kubo in our leisure time but the final step
(boxo) requires at least 300+ new packages.

- bitmask                       : 0.21.11->0.24.8 requires go-github-com-xtaci-kcp-go
- chezmoi                       : 1.8.10->2.52.2, 34+ new packages
- go-github-com-google-cadvisor : 0.0.0-0.2ed7198->0.50.0 216+ new packages
- go-github-com-ipfs-boxo       : to unbundle from Kubo, 218+ new packages
- go-github-com-spf13-afero     : 1.2.2->1.11.0, 194+ new packages
- go-github-com-spf13-viper     : 1.7.0->1.19.0, 225+ new packages
- go-github-com-xtaci-kcp-go    : to update bitmask, 200+ new packages
- rclone                        : 1.52.3->1.68.0, 348+ new packages
- restic                        : 0.9.6->0.17.1, 221+ new packages

Some of them may intersect.

* Branch stats

--8<---------------cut here---------------start------------->8---
---[ Commits stats ]---
* from-to: caa9b4cbcb..ad39aa19
* count: 169

---[ Packages stats ]---
* added: 44
* fixed: 25
* adjusted: 2
* realocated: 21
* removed: 7
* updated: 44

---[ Contributors ]---
* Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
* Brennan Vincent <brennan <at> umanwizard.com>
* Christina O'Donnell <cdo <at> mutix.org>
* Efraim Flashner <efraim <at> flashner.co.il>
* Sharlatan Hellseher <sharlatanus <at> gmail.com>
* Troy Figiel <troy <at> troyfigiel.com>

---[ Refresh inpact ]---
Building the following 764 packages would ensure 1686 dependent packages are rebuilt
--8<---------------cut here---------------end--------------->8---

* Script

--8<---------------cut here---------------start------------->8---
#!/usr/bin/env bash

REQUIRE=(
    git
    grep
    awk
)

get_refreshed_pkg()
{
    local start="$1"
    local end="$2"
    local pkgs=$(mktemp -t packages.XXXXXX)

    git log "$start".."$end" --oneline |
        awk -F: '/gnu:.*:.*\./{print $2}' |
        sed -e 's/.*\/.*//' |
        sort -u |
        while read -r pkg
        do
            if ./pre-inst-env guix show "$pkg" &>/dev/null
            then
                printf "%s " "$pkg" >> "$pkgs"
            fi
        done

    ./pre-inst-env guix refresh --list-dependent $(cat "$pkgs") |
        awk -F: '{print $1}'

    rm "$pkgs"
}

main()
{
   local start="$1"
   local end="$2"

   printf -- "---[ Commits stats ]---\n"
   printf "* from-to: %s..%s\n" "$start" "$end"
   printf "* count: %s\n" $(git log "$start".."$end" --oneline | wc -l)

   printf -- "\n---[ Packages stats ]---\n"
   printf "* added: %s\n" $(git log "$start".."$end" --oneline | grep "gnu: Add" -c)
   printf "* fixed: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Fix" -c)
   printf "* adjusted: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Adjust\|gnu:.*Improve" -c)
   printf "* realocated: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Move to" -c)
   printf "* removed: %s\n" $(git log "$start".."$end" --oneline | grep "gnu: Remove" -c)
   printf "* updated: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Update" -c)

   printf "\n---[ Contributors ]---\n"
   git log "$start".."$end" --graph --pretty=format:'%an <%ae>' | sort -u

   printf -- "\n---[ Refresh inpact ]---\n"
   get_refreshed_pkg "$start" "$end"
}

main "$@"
--8<---------------cut here---------------end--------------->8---

--
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Brennan Vincent" <brennan <at> umanwizard.com>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>, guix-patches <at> gnu.org
Cc: guix-devel <at> gnu.org, Christina O'Donnell <cdo <at> mutix.org>,
 "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>,
 Troy Figiel <troy <at> troyfigiel.com>, Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: Request for merging "go-team" branch
Date: Sun, 29 Sep 2024 14:47:31 -0400

[Message part 1 (text/plain, inline)]

Hi Sharlatan,

Could we please Go 1.22 to the latest minor version before merging?
Patch is attached.

[0001-gnu-go-1.23-Update-to-1.23.1.patch (text/x-patch, attachment)]

[Message part 3 (text/plain, inline)]

Sharlatan Hellseher <sharlatanus <at> gmail.com> writes:

> Hi Guix!
>
> After a few weeks of working on go-team it's ready for the final review
> and merge to master.
>
> My target was to update and move packages from (gnu packages golang) to
> logical submodules and prepare bare minimal refreshed amount to complete
> Prometheus packaging.
>
> * Covered issues
>
> - <https://issues.guix.gnu.org/69827>
>   [PATCH 1/3] build-system/go: Add subdir parameter to go-version->git-ref.
>
> - <https://issues.guix.gnu.org/73171>
>   [PATCH] gnu: go-1.23: Update to 1.23.1.
>
> - <https://issues.guix.gnu.org/73176>
>   [PATCH] gnu: go-1.20: Build with gccgo-12 on some systems.
>
> - <https://issues.guix.gnu.org/73299>
>   [PATCH] build/go: Replace symlinks with a copy of the file.
>
> - <https://issues.guix.gnu.org/73184>
> [PATCH 0/5] Add some Golang libraries from the "awesome-go" list
>
> - <https://issues.guix.gnu.org/69376>
> [PATCH go-team] build-system/go: Allow providing additional test flags.
>
> #69827 may cover/resolve few more:
> - <2021-12-07> guix import go error https://issues.guix.gnu.org/52362
>   by Stephen Webber <montokapro <at> gmail.com>
>
> - <2023-04-21> Go importer doesn't know MODULE/vX.Y version tags
>   https://issues.guix.gnu.org/63001 by Timo Wilken  guix <at> twilken.net
>
> - <2023-05-22> [PATCH 0/2] Fix annoyance with "guix import go"
>   https://issues.guix.gnu.org/63647 by Simon Tournier
>   <zimon.toutoune <at> gmail.com>
>
> - <2023-06-12> [PATH] fix a bug on importing go packages.
>   https://issues.guix.gnu.org/64035,
>   https://issues.guix.gnu.org/64036 by Elbek
>
> * Findings and potential refresh blockers
>
> During refresh I've faced with go packages which still include vendor
> directory and due to a large packaging efforts requiring to unbundle
> them all might need some efforts distribution among volunteers.
>
> Me and Artyom unbundling Kubo in our leisure time but the final step
> (boxo) requires at least 300+ new packages.
>
> - bitmask                       : 0.21.11->0.24.8 requires go-github-com-xtaci-kcp-go
> - chezmoi                       : 1.8.10->2.52.2, 34+ new packages
> - go-github-com-google-cadvisor : 0.0.0-0.2ed7198->0.50.0 216+ new packages
> - go-github-com-ipfs-boxo       : to unbundle from Kubo, 218+ new packages
> - go-github-com-spf13-afero     : 1.2.2->1.11.0, 194+ new packages
> - go-github-com-spf13-viper     : 1.7.0->1.19.0, 225+ new packages
> - go-github-com-xtaci-kcp-go    : to update bitmask, 200+ new packages
> - rclone                        : 1.52.3->1.68.0, 348+ new packages
> - restic                        : 0.9.6->0.17.1, 221+ new packages
>
> Some of them may intersect.
>
> * Branch stats
>
> --8<---------------cut here---------------start------------->8---
> ---[ Commits stats ]---
> * from-to: caa9b4cbcb..ad39aa19
> * count: 169
>
> ---[ Packages stats ]---
> * added: 44
> * fixed: 25
> * adjusted: 2
> * realocated: 21
> * removed: 7
> * updated: 44
>
> ---[ Contributors ]---
> * Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
> * Brennan Vincent <brennan <at> umanwizard.com>
> * Christina O'Donnell <cdo <at> mutix.org>
> * Efraim Flashner <efraim <at> flashner.co.il>
> * Sharlatan Hellseher <sharlatanus <at> gmail.com>
> * Troy Figiel <troy <at> troyfigiel.com>
>
> ---[ Refresh inpact ]---
> Building the following 764 packages would ensure 1686 dependent packages are rebuilt
> --8<---------------cut here---------------end--------------->8---
>
> * Script
>
> --8<---------------cut here---------------start------------->8---
> #!/usr/bin/env bash
>
> REQUIRE=(
>     git
>     grep
>     awk
> )
>
> get_refreshed_pkg()
> {
>     local start="$1"
>     local end="$2"
>     local pkgs=$(mktemp -t packages.XXXXXX)
>
>     git log "$start".."$end" --oneline |
>         awk -F: '/gnu:.*:.*\./{print $2}' |
>         sed -e 's/.*\/.*//' |
>         sort -u |
>         while read -r pkg
>         do
>             if ./pre-inst-env guix show "$pkg" &>/dev/null
>             then
>                 printf "%s " "$pkg" >> "$pkgs"
>             fi
>         done
>
>     ./pre-inst-env guix refresh --list-dependent $(cat "$pkgs") |
>         awk -F: '{print $1}'
>
>     rm "$pkgs"
> }
>
> main()
> {
>    local start="$1"
>    local end="$2"
>
>    printf -- "---[ Commits stats ]---\n"
>    printf "* from-to: %s..%s\n" "$start" "$end"
>    printf "* count: %s\n" $(git log "$start".."$end" --oneline | wc -l)
>
>    printf -- "\n---[ Packages stats ]---\n"
>    printf "* added: %s\n" $(git log "$start".."$end" --oneline | grep "gnu: Add" -c)
>    printf "* fixed: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Fix" -c)
>    printf "* adjusted: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Adjust\|gnu:.*Improve" -c)
>    printf "* realocated: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Move to" -c)
>    printf "* removed: %s\n" $(git log "$start".."$end" --oneline | grep "gnu: Remove" -c)
>    printf "* updated: %s\n" $(git log "$start".."$end" --oneline | grep "gnu:.*Update" -c)
>
>    printf "\n---[ Contributors ]---\n"
>    git log "$start".."$end" --graph --pretty=format:'%an <%ae>' | sort -u
>
>    printf -- "\n---[ Refresh inpact ]---\n"
>    get_refreshed_pkg "$start" "$end"
> }
>
> main "$@"
> --8<---------------cut here---------------end--------------->8---
>
> --
> Oleg

Message #11 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 73502 <at> debbugs.gnu.org
Cc: Brennan Vincent <brennan <at> umanwizard.com>
Subject: Request for merging "go-team" branch
Date: Sun, 29 Sep 2024 20:19:32 +0100

[Message part 1 (text/plain, inline)]

Hi Brennan,

May you check which version you were intended to update by that patch,
please, it's a little confusing: the header mentions go-1.23, but changes
are applied for go-1.22.

The latest upstream:
- go-1.22 - https://github.com/golang/go/tree/go1.22.7
- go-1.23 - https://github.com/golang/go/tree/go1.23.1

--
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Brennan Vincent <brennan <at> umanwizard.com>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Cc: 73502 <at> debbugs.gnu.org
Subject: Re: Request for merging "go-team" branch
Date: Sun, 29 Sep 2024 15:31:21 -0400

It’s 1.22.7

I just made a mistake in the commit message.

> On Sep 29, 2024, at 15:19, Sharlatan Hellseher <sharlatanus <at> gmail.com> wrote:
> 
> 
> Hi Brennan,
> 
> May you check which version you were intended to update by that patch,
> please, it's a little confusing: the header mentions go-1.23, but changes
> are applied for go-1.22.
> 
> The latest upstream:
> - go-1.22 - https://github.com/golang/go/tree/go1.22.7
> - go-1.23 - https://github.com/golang/go/tree/go1.23.1
> 
> --
> Oleg
> <signature.asc>

Message #17 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 73502 <at> debbugs.gnu.org
Subject: Request for merging "go-team" branch
Date: Sun, 29 Sep 2024 21:39:19 +0100

[Message part 1 (text/plain, inline)]

Hi,

Pushed, with modified message:
--8<---------------cut here---------------start------------->8---
go-team 58dd7778bcdf5fc45725b59ea81e9a218c223286
Author:     Brennan Vincent <brennan <at> umanwizard.com>
AuthorDate: Sun Sep 29 14:41:05 2024 -0400
Commit:     Sharlatan Hellseher <sharlatanus <at> gmail.com>
CommitDate: Sun Sep 29 21:25:49 2024 +0100

gnu: go-1.22: Update to 1.22.7.

* gnu/packages/golang.scm (go-1.22): Update to 1.22.7.

Change-Id: I67fbb1c630a08cfb29f2230a600bf3a24e2c8486
Signed-off-by: Sharlatan Hellseher <sharlatanus <at> gmail.com>

1 file changed, 2 insertions(+), 2 deletions(-)
gnu/packages/golang.scm | 4 ++--

modified   gnu/packages/golang.scm
@@ -954,7 +954,7 @@ (define-public go-1.22
   (package
     (inherit go-1.21)
     (name "go")
-    (version "1.22.6")
+    (version "1.22.7")
     (source
      (origin
        (method git-fetch)
@@ -963,7 +963,7 @@ (define-public go-1.22
              (commit (string-append "go" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1rjplx7wa6p2c19grx6hhkhn16mmbib5cwmhz9k8ywymlbmhhsyd"))))
+        (base32 "0m1idhhifhpjf6n56pca4wg6cyripdzmyl0jswdiy0kiqvs3whqb"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.21)
        ((#:phases phases)
--8<---------------cut here---------------end--------------->8---

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Cc: Christina O'Donnell <cdo <at> mutix.org>,
 Brennan Vincent <brennan <at> umanwizard.com>, 73502 <at> debbugs.gnu.org,
 Efraim Flashner <efraim <at> flashner.co.il>, Troy Figiel <troy <at> troyfigiel.com>,
 guix-devel <at> gnu.org, "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Re: bug#73502: Request for merging "go-team" branch
Date: Wed, 06 Nov 2024 23:19:57 +0100

Hello,

Sharlatan Hellseher <sharlatanus <at> gmail.com> skribis:

> After a few weeks of working on go-team it's ready for the final review
> and merge to master.

This is next in queue for a merge:

  https://qa.guix.gnu.org/

Anyone who can help Sharlatan and Katherine get this past the finish
line and possibly join them on the Go team, now’s the time!

See <https://issues.guix.gnu.org/73502>.

Ludo’.

Message #23 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 73502 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: Request for merging "go-team" branch
Date: Thu, 07 Nov 2024 16:35:41 +0000

[Message part 1 (text/plain, inline)]

Hi,

I've rebased and pushed go-team 44h ago, the evaluation nearly finished
with no regressions detected. ARM builds are still lagged behind

https://ci.guix.gnu.org/eval/1785461

Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #26 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 73502 <at> debbugs.gnu.org
Cc: Christina O'Donnell <cdo <at> mutix.org>,
 Brennan Vincent <brennan <at> umanwizard.com>,
 Efraim Flashner <efraim <at> flashner.co.il>, Troy Figiel <troy <at> troyfigiel.com>,
 guix-devel <at> gnu.org, "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Request for merging "go-team" branch
Date: Fri, 08 Nov 2024 22:21:52 +0000

[Message part 1 (text/plain, inline)]

Hi!

I'm tempted to merge go-team to master today/tomorrow. Nothing major was
added since last time I've rebased it and the build coverage looks
positive without regression. ARM builds are still scheduled, but as I
noticed it's quite normal.

--
Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #29 received at 73502 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 73502 <at> debbugs.gnu.org
Subject: Request for merging "go-team" branch
Date: Sat, 09 Nov 2024 21:53:06 +0000

[Message part 1 (text/plain, inline)]

Hi,

go-team branch has been rebased and merged to master without any
conflicts.

--
Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #34 received at 73502-done <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 73502-done <at> debbugs.gnu.org
Subject: Request for merging "go-team" branch
Date: Sat, 09 Nov 2024 21:53:39 +0000

[Message part 1 (text/plain, inline)]

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.