From 1a4c5cd69081fa61d0e6b2bf12ee031eb6b5f374 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Thu, 15 Jan 2026 11:05:02 +0100 Subject: [PATCH] fix: pin github.com/urfave/cli to v3.5.0 (#10828) Upgrading to v3.6.1 breaks `--help` ``` $ forgejo forgejo-cli --help Incorrect Usage: flag provided but not defined: -help ``` ### Testing ``` $ make forgejo $ ./forgejo forgejo-cli --help NAME: forgejo forgejo-cli - Forgejo CLI USAGE: forgejo forgejo-cli [command [command options]] COMMANDS: actions Commands for managing Forgejo Actions f3 F3 ``` Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10828 Reviewed-by: Gusted Reviewed-by: Michael Kriese Co-authored-by: limiting-factor Co-committed-by: limiting-factor --- cmd/main_test.go | 5 +++++ go.mod | 2 ++ go.sum | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/main_test.go b/cmd/main_test.go index 737150c62f..1ec3471343 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -108,6 +108,11 @@ func TestCliCmd(t *testing.T) { cmd: "./gitea test-cmd --config /tmp/app-other.ini", exp: makePathOutput("/tmp", "/tmp/custom", "/tmp/app-other.ini"), }, + { + env: map[string]string{"GITEA_WORK_DIR": "/tmp"}, + cmd: "./gitea forgejo-cli --help", + exp: "(subcommand help template)", + }, } for _, c := range cases { diff --git a/go.mod b/go.mod index 3bc49aa701..e50d57ffc5 100644 --- a/go.mod +++ b/go.mod @@ -274,3 +274,5 @@ replace github.com/gliderlabs/ssh => code.forgejo.org/forgejo/ssh v0.0.0-2024121 replace git.sr.ht/~mariusor/go-xsd-duration => code.forgejo.org/forgejo/go-xsd-duration v0.0.0-20220703122237-02e73435a078 replace xorm.io/xorm v1.3.9 => code.forgejo.org/xorm/xorm v1.3.9-forgejo.4 + +replace github.com/urfave/cli/v3 => github.com/urfave/cli/v3 v3.5.0 diff --git a/go.sum b/go.sum index 52df9db5f6..fb35920cda 100644 --- a/go.sum +++ b/go.sum @@ -660,8 +660,8 @@ github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/urfave/cli/v3 v3.6.1 h1:j8Qq8NyUawj/7rTYdBGrxcH7A/j7/G8Q5LhWEW4G3Mo= -github.com/urfave/cli/v3 v3.6.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= +github.com/urfave/cli/v3 v3.5.0 h1:qCuFMmdayTF3zmjG8TSsoBzrDqszNrklYg2x3g4MSgw= +github.com/urfave/cli/v3 v3.5.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/valyala/fastjson v1.6.7 h1:ZE4tRy0CIkh+qDc5McjatheGX2czdn8slQjomexVpBM= github.com/valyala/fastjson v1.6.7/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=