Skip to content

chore: Decrease startup time and reduce binary size #4357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2025
Merged

chore: Decrease startup time and reduce binary size #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f97a36
chore: Downgrade github.com/google/go-github to avoid duplicate module
twpayne Mar 19, 2025
5b792c3
chore: Use standard regexp package for gitleaks
twpayne Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestRelease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ the same *owner-repo* will only result in one call to the GitHub API.
{{ (gitHubLatestRelease "docker/compose").TagName }}
```

[bindings]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryRelease
[bindings]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryRelease
2 changes: 1 addition & 1 deletion ...moi.io/docs/reference/templates/github-functions/gitHubLatestReleaseAssetURL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ call to the GitHub API.

```

[bindings]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryRelease
[bindings]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryRelease
[match]: https://pkg.go.dev/path#Match
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/reference/templates/github-functions/gitHubLatestTag.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ call to the GitHub API.
recent tag, the GitHub API documentation does not specify the order of the
returned tags.

[bindings]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryTag
[bindings]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryTag
[tags]: /reference/templates/github-functions/gitHubTags.md
[endpoint]: https://docs.github.com/en/rest/repos/repos#list-repository-tags
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/reference/templates/github-functions/gitHubRelease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ the same *owner-repo* *version* will only result in one call to the GitHub API.
{{ (gitHubRelease "docker/compose" "v2.29.1").TagName }}
```

[bindings]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryRelease
[bindings]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryRelease
2 changes: 1 addition & 1 deletion ...s/chezmoi.io/docs/reference/templates/github-functions/gitHubReleaseAssetURL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ call to the GitHub API.
{{ gitHubReleaseAssetURL "twpayne/chezmoi" "v2.50.0" (printf "chezmoi-%s-%s" .chezmoi.os .chezmoi.arch) }}
```

[bindings]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryRelease
[bindings]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryRelease
[match]: https://pkg.go.dev/path#Match
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/reference/templates/github-functions/gitHubReleases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Calls to `gitHubReleases` are cached so calling `gitHubReleases` with the same
```


[github-go]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryRelease
[github-go]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryRelease
[jq]: /reference/templates/functions/jq.md
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/reference/templates/github-functions/gitHubTags.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ Calls to `gitHubTags` are cached so calling `gitHubTags` with the same
{{ gitHubTags "docker/compose" | toJson | fromJson | jq ".[0].name" }}
```

[github-go]: https://pkg.go.dev/github.com/google/go-github/v69/github#RepositoryTag
[github-go]: https://pkg.go.dev/github.com/google/go-github/v61/github#RepositoryTag
[jq]: /reference/templates/functions/jq.md
9 changes: 7 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/fsnotify/fsnotify v1.8.0
github.com/go-git/go-git/v5 v5.14.0
github.com/goccy/go-yaml v1.16.0
github.com/google/go-github/v69 v69.2.0
github.com/google/go-github/v61 v61.0.0
github.com/google/renameio/v2 v2.0.0
github.com/gopasspw/gopass v1.15.15
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
Expand Down Expand Up @@ -123,7 +123,6 @@ require (
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-github/v61 v61.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/css v1.0.1 // indirect
Expand Down Expand Up @@ -183,3 +182,9 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

// Use a fork of gitleaks that uses the standard regexp package, not
// github.com/wasilibs/go-re2. This improves startup time, and avoids linking in a
// full WASM runtime.
// See https://github.com/gitleaks/gitleaks/issues/1796.
replace github.com/zricethezav/gitleaks/v8 => github.com/twpayne/gitleaks/v8 v8.0.0-20250319121243-993bde9542cc
16 changes: 6 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,6 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
github.com/google/go-github/v69 v69.2.0 h1:wR+Wi/fN2zdUx9YxSmYE0ktiX9IAR/BeePzeaUUbEHE=
github.com/google/go-github/v69 v69.2.0/go.mod h1:xne4jymxLR6Uj9b7J7PyTpkMYstEMMwGZa0Aehh1azM=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
Expand Down Expand Up @@ -316,8 +314,8 @@ github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb h1:w1g9wNDIE/pHS
github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4=
github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/makiuchi-d/gozxing v0.1.1 h1:xxqijhoedi+/lZlhINteGbywIrewVdVv2wl9r5O9S1I=
github.com/makiuchi-d/gozxing v0.1.1/go.mod h1:eRIHbOjX7QWxLIDJoQuMLhuXg9LAuw6znsUtRkNw9DU=
github.com/martinhoefling/goxkcdpwgen v0.1.2-0.20231122080842-e51aa57005ca h1:jV6vw7U2RoS1sI7f6f12/wsCwMjADZ/xUxi/lhUqjV8=
Expand Down Expand Up @@ -368,8 +366,6 @@ github.com/noborus/ov v0.37.0 h1:I8+5OmV+yC71OrDtY1dfO2UmZrSQ7ERDTSo6M2Gbie0=
github.com/noborus/ov v0.37.0/go.mod h1:cac6+F9N4F0rBKu4jWKiqH0n2lJGiNQpO2OYNQTttmA=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
Expand Down Expand Up @@ -406,6 +402,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sagikazarmark/locafero v0.8.0 h1:mXaMVw7IqxNBxfv3LdWt9MDmcWDQ1fagDH918lOdVaQ=
github.com/sagikazarmark/locafero v0.8.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk=
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e h1:HFUDYOpUVZ0oTXeZy2A59Lkf69SsOF03Lg1GsI3Xh9o=
Expand Down Expand Up @@ -433,8 +431,6 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
Expand All @@ -461,6 +457,8 @@ github.com/tobischo/argon2 v0.1.0 h1:mwAx/9DK/4rP0xzNifb/XMAf43dU3eG1B3aeF88qu4Y
github.com/tobischo/argon2 v0.1.0/go.mod h1:4NLmLFwhWPbT66nRZNgcktV/mibJ6fESoeEp43h9GRw=
github.com/tobischo/gokeepasslib/v3 v3.6.1 h1:AShQlTypdM19glj0UUePQcUi56qQyeFI5NcrWnVFudA=
github.com/tobischo/gokeepasslib/v3 v3.6.1/go.mod h1:B31dx/dj0egameQrNtuoOx9RnwxnYaZR4kXaahRuZN8=
github.com/twpayne/gitleaks/v8 v8.0.0-20250319121243-993bde9542cc h1:8w2f5DirZbjJ5UgwNQ4Yi6UjhSmHDjj8f6E902RCF2A=
github.com/twpayne/gitleaks/v8 v8.0.0-20250319121243-993bde9542cc/go.mod h1:D3AhHRLVp0DigFQNxAgHcQks8EbF7wCZanT/UbGd0Jo=
github.com/twpayne/go-expect v0.0.2-0.20241130000624-916db2914efd h1:/ekqcdG89euFEeFfuFYGF2An2AwsaJHnYxVwW8hqvcw=
github.com/twpayne/go-expect v0.0.2-0.20241130000624-916db2914efd/go.mod h1:Z1PlEHxKw23bid0pq2RhO4NMScxckEhBXZLebwJpjrk=
github.com/twpayne/go-pinentry v0.3.0 h1:Rr+fEOZXmeItOb4thjeVaBWJKB9Xa/eojolycyF/26c=
Expand Down Expand Up @@ -501,8 +499,6 @@ github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8u
github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
github.com/zricethezav/gitleaks/v8 v8.24.0 h1:yrJ81El2tCBrhp6fapUBvqgCXVdh1w/P5DdZOZUQqB0=
github.com/zricethezav/gitleaks/v8 v8.24.0/go.mod h1:hAWbK85gzn04aqM6jI8paV6YJsUsh6cVV+BYQB6T+Bc=
go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
go.etcd.io/gofail v0.2.0 h1:p19drv16FKK345a09a1iubchlw/vmRuksmRzgBIGjcA=
Expand Down
2 changes: 1 addition & 1 deletion internal/chezmoi/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"os"

"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"
"golang.org/x/oauth2"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/doctorcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

"github.com/coreos/go-semver/semver"
"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"
"github.com/spf13/cobra"
"github.com/twpayne/go-shell"
"github.com/twpayne/go-xdg/v6"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/githubtemplatefuncs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"

"github.com/twpayne/chezmoi/v2/internal/chezmoi"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/upgradecmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

"github.com/coreos/go-semver/semver"
"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"
"github.com/spf13/cobra"

"github.com/twpayne/chezmoi/v2/internal/chezmoi"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/upgradecmd_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"strings"

"github.com/coreos/go-semver/semver"
"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"
vfs "github.com/twpayne/go-vfs/v5"

"github.com/twpayne/chezmoi/v2/internal/chezmoi"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/upgradecmd_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"

"github.com/coreos/go-semver/semver"
"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"
vfs "github.com/twpayne/go-vfs/v5"

"github.com/twpayne/chezmoi/v2/internal/chezmoi"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmds/execute-template/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/Masterminds/sprig/v3"
"github.com/goccy/go-yaml"
"github.com/google/go-github/v69/github"
"github.com/google/go-github/v61/github"
"github.com/google/renameio/v2/maybe"

"github.com/twpayne/chezmoi/v2/internal/chezmoi"
Expand Down
Loading