artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 19:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chd/rel: adjust version flag requirement in sg rel (#61192)

Browse Source 
* chd/rel: adjust version flag requirement in sg rel

* Update dev/sg/internal/release/release.go

Co-authored-by: William Bezuidenhout <william.bezuidenhout@sourcegraph.com>

---------

Co-authored-by: William Bezuidenhout <william.bezuidenhout@sourcegraph.com>
This commit is contained in:
Jean-Hadrien Chabran 2024-03-15 13:50:19 +01:00 committed by GitHub
parent 557c962b7d
commit 92b79c59da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dev/sg/internal/release/release.go
View File

@ -10,7 +10,10 @@ import (
"github.com/urfave/cli/v2"
)
var releaseRunFlags = []cli.Flag{
// releaseBaseFlags are the flags that are common to all subcommands of the release command.
// In particular, the version flag is not included in that list, because while it's required
// for create and promote-to-public, it's not for the others (to allow --config-from-commit).
var releaseBaseFlags = []cli.Flag{
&cli.StringFlag{
Name: "workdir",
Value: ".",
@ -30,11 +33,6 @@ var releaseRunFlags = []cli.Flag{
Value: false,
Usage: "Preview all the commands that would be performed",
},
&cli.StringFlag{
Name: "version",
Usage: "Force version",
Required: true,
},
&cli.StringFlag{
Name: "inputs",
Usage: "Set inputs to use for a given release, ex: --input=server=v5.2.404040,foobar=ffefe",
@ -46,6 +44,24 @@ var releaseRunFlags = []cli.Flag{
},
}
// releaseRunFlags are the flags for the release run * subcommands. Version is optional here, because
// we can also use --infer-from-commit.
var releaseRunFlags = append(releaseBaseFlags, &cli.StringFlag{
Name: "version",
Usage: "Force version",
})
// releaseCreatePromoteFlags are the flags for the release create and promote-to-public subcommands, Version
// is required here, because it makes no sense to create a release without one.
//
// TODO https://github.com/sourcegraph/sourcegraph/issues/61077 to add the "auto" value that ask
// the releaseregistry to provide the version number.
var releaseCreatePromoteFlags = append(releaseBaseFlags, &cli.StringFlag{
Name: "version",
Usage: "Force version (required)",
Required: true,
})
var Command = &cli.Command{
Name: "release",
Usage: "Sourcegraph release utilities",
@ -123,7 +139,7 @@ var Command = &cli.Command{
Description: "See https://go/releases",
UsageText: "sg release create --workdir [path-to-folder-with-manifest] --version vX.Y.Z",
Category: category.Util,
Flags: releaseRunFlags,
Flags: releaseCreatePromoteFlags,
Action: func(cctx *cli.Context) error {
r, err := newReleaseRunnerFromCliContext(cctx)
if err != nil {
@ -137,7 +153,7 @@ var Command = &cli.Command{
Usage: "Promote an internal release to the public",
UsageText: "sg release promote-to-public --workdir [path-to-folder-with-manifest] --version vX.Y.Z",
Category: category.Util,
Flags: releaseRunFlags,
Flags: releaseCreatePromoteFlags,
Action: func(cctx *cli.Context) error {
r, err := newReleaseRunnerFromCliContext(cctx)
if err != nil {
@ -150,6 +166,14 @@ var Command = &cli.Command{
}
func newReleaseRunnerFromCliContext(cctx *cli.Context) (*releaseRunner, error) {
if cctx.Bool("config-from-commit") && cctx.String("version") != "" {
return nil, errors.New("You cannot use --config-from-commit and --version at the same time")
}
if !cctx.Bool("config-from-commit") && cctx.String("version") == "" {
return nil, errors.New("You must provide a version by specifying either --version or --config-from-commit")
}
workdir := cctx.String("workdir")
pretend := cctx.Bool("pretend")
// Normalize the version string, to prevent issues where this was given with the wrong convention