Merge branch 'main' into gen-woodpecker-go

woodpecker-ci · Nov 30, 2024 · 5ab795b · 5ab795b
2 parents ad4f353 + 0f87ddc
commit 5ab795b
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 39 deletions.
diff --git a/cli/admin/admin.go b/cli/admin/admin.go
@@ -28,9 +28,9 @@ var Command = &cli.Command{
 	Name:  "admin",
 	Usage: "manage server settings",
 	Commands: []*cli.Command{
-		secret.Command,
+		loglevel.Command,
 		registry.Command,
+		secret.Command,
 		user.Command,
-		loglevel.Command,
 	},
 }
diff --git a/cli/admin/registry/registry.go b/cli/admin/registry/registry.go
@@ -25,8 +25,8 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		registryCreateCmd,
 		registryDeleteCmd,
-		registryUpdateCmd,
-		registryShowCmd,
 		registryListCmd,
+		registryShowCmd,
+		registryUpdateCmd,
 	},
 }
diff --git a/cli/admin/secret/secret.go b/cli/admin/secret/secret.go
@@ -25,8 +25,8 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		secretCreateCmd,
 		secretDeleteCmd,
-		secretUpdateCmd,
-		secretShowCmd,
 		secretListCmd,
+		secretShowCmd,
+		secretUpdateCmd,
 	},
 }
diff --git a/cli/admin/user/user.go b/cli/admin/user/user.go
@@ -23,9 +23,9 @@ var Command = &cli.Command{
 	Name:  "user",
 	Usage: "manage users",
 	Commands: []*cli.Command{
-		userListCmd,
-		userShowCmd,
 		userAddCmd,
+		userListCmd,
 		userRemoveCmd,
+		userShowCmd,
 	},
 }
diff --git a/cli/org/registry/registry.go b/cli/org/registry/registry.go
@@ -29,9 +29,9 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		registryCreateCmd,
 		registryDeleteCmd,
-		registryUpdateCmd,
-		registryShowCmd,
 		registryListCmd,
+		registryShowCmd,
+		registryUpdateCmd,
 	},
 }
 

diff --git a/cli/org/secret/secret.go b/cli/org/secret/secret.go
@@ -29,9 +29,9 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		secretCreateCmd,
 		secretDeleteCmd,
-		secretUpdateCmd,
-		secretShowCmd,
 		secretListCmd,
+		secretShowCmd,
+		secretUpdateCmd,
 	},
 }
 

diff --git a/cli/pipeline/log/log.go b/cli/pipeline/log/log.go
@@ -23,7 +23,7 @@ var Command = &cli.Command{
 	Name:  "log",
 	Usage: "manage logs",
 	Commands: []*cli.Command{
-		logShowCmd,
 		logPurgeCmd,
+		logShowCmd,
 	},
 }
diff --git a/cli/pipeline/pipeline.go b/cli/pipeline/pipeline.go
@@ -33,20 +33,20 @@ var Command = &cli.Command{
 	Name:  "pipeline",
 	Usage: "manage pipelines",
 	Commands: []*cli.Command{
-		buildPipelineListCmd(),
-		pipelineLastCmd,
-		pipelineShowCmd,
-		pipelineStopCmd,
-		pipelineStartCmd,
 		pipelineApproveCmd,
+		pipelineCreateCmd,
 		pipelineDeclineCmd,
-		pipelineQueueCmd,
+		deploy.Command,
 		pipelineKillCmd,
-		pipelinePsCmd,
-		pipelineCreateCmd,
+		pipelineLastCmd,
+		buildPipelineListCmd(),
 		log.Command,
-		deploy.Command,
+		pipelinePsCmd,
 		pipelinePurgeCmd,
+		pipelineQueueCmd,
+		pipelineShowCmd,
+		pipelineStartCmd,
+		pipelineStopCmd,
 	},
 }
 

diff --git a/cli/pipeline/purge.go b/cli/pipeline/purge.go
@@ -113,7 +113,8 @@ func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) {
 	}
 
 	for i, p := range pipelinesToPurge {
-		log.Debug().Msgf("%sprune %v/%v pipelines from repo '%v'", msgPrefix, i+1, len(pipelinesToPurge), repoIDOrFullName)
+		// cspell:words spurge
+		log.Debug().Msgf("%spurge %v/%v pipelines from repo '%v'", msgPrefix, i+1, len(pipelinesToPurge), repoIDOrFullName)
 		if dryRun {
 			continue
 		}

diff --git a/cli/repo/cron/cron.go b/cli/repo/cron/cron.go
@@ -25,8 +25,8 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		cronCreateCmd,
 		cronDeleteCmd,
-		cronUpdateCmd,
-		cronShowCmd,
 		cronListCmd,
+		cronShowCmd,
+		cronUpdateCmd,
 	},
 }
diff --git a/cli/repo/registry/registry.go b/cli/repo/registry/registry.go
@@ -28,9 +28,9 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		registryCreateCmd,
 		registryDeleteCmd,
-		registryUpdateCmd,
-		registryShowCmd,
 		registryListCmd,
+		registryShowCmd,
+		registryUpdateCmd,
 	},
 }
 

diff --git a/cli/repo/repo.go b/cli/repo/repo.go
@@ -27,16 +27,16 @@ var Command = &cli.Command{
 	Name:  "repo",
 	Usage: "manage repositories",
 	Commands: []*cli.Command{
-		repoListCmd,
-		repoShowCmd,
 		repoAddCmd,
-		repoUpdateCmd,
-		repoRemoveCmd,
-		repoRepairCmd,
 		repoChownCmd,
-		repoSyncCmd,
+		cron.Command,
+		repoListCmd,
 		registry.Command,
+		repoRemoveCmd,
+		repoRepairCmd,
 		secret.Command,
-		cron.Command,
+		repoShowCmd,
+		repoSyncCmd,
+		repoUpdateCmd,
 	},
 }
diff --git a/cli/repo/secret/secret.go b/cli/repo/secret/secret.go
@@ -28,9 +28,9 @@ var Command = &cli.Command{
 	Commands: []*cli.Command{
 		secretCreateCmd,
 		secretDeleteCmd,
-		secretUpdateCmd,
-		secretShowCmd,
 		secretListCmd,
+		secretShowCmd,
+		secretUpdateCmd,
 	},
 }
 

diff --git a/cmd/cli/app.go b/cmd/cli/app.go
@@ -43,12 +43,12 @@ func newApp() *cli.Command {
 	app.Suggest = true
 	app.Commands = []*cli.Command{
 		admin.Command,
-		org.Command,
-		repo.Command,
-		pipeline.Command,
 		exec.Command,
 		info.Command,
 		lint.Command,
+		org.Command,
+		pipeline.Command,
+		repo.Command,
 		setup.Command,
 		update.Command,
 	}