chore(deps): update golangci/golangci-lint docker tag to v1.61

Reviewed-on: https://codeberg.org/woodpecker-plugins/go-plugin/pulls/32
Co-authored-by: woodpecker-bot <woodpecker-bot@obermui.de>
Co-committed-by: woodpecker-bot <woodpecker-bot@obermui.de>

.gitignore

@@ -0,0 +1,23 @@
+
+### Go ###
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+vendor/
+
+# Go workspace file
+go.work
+
+### IDE ###
+.vscode/

.woodpecker.yaml

@@ -6,16 +6,28 @@ when:
       - 'renovate/*'
 
 variables:
-  - &golang "golang:1.21"
+  - &golang "golang:1.23"
+  - &golangci-lint "golangci/golangci-lint:v1.61-alpine"
+  - &reviewdog-golangci-lint "woodpeckerci/plugin-reviewdog-golangci-lint:1.59"
 
 steps:
   vendor:
     image: *golang
     commands: go mod vendor
 
+  review-go:
+    image: *reviewdog-golangci-lint
+    settings:
+      token:
+        from_secret: reviewdog_token
+    when:
+      event: pull_request
+
   lint:
-    image: golangci/golangci-lint:v1.55-alpine
+    image: *golangci-lint
-    commands: golangci-lint run
+    commands: golangci-lint run --timeout 5m
+    when:
+      event: [push, tag, cron]
 
   test:
     image: *golang

README.md

@@ -8,12 +8,12 @@ HTTP client library.
 
 ## Builtin settings
 
-| Settings Name | Environment variable | Default | Description |
+| Settings Name | Environment variable | Default | Description                                                                  |
-|---|---|----|---|
+| ------------- | -------------------- | ------- | ---------------------------------------------------------------------------- | ------------------------------------ |
-| `log_level` | - | `info` | Sets log level (`panic`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`) |
+| `log_level`   | -                    | `info`  | Sets log level (`panic`, `fatal`, `error`, `warn`, `info`, `debug`, `trace`) |
-| `skip_verify` | - | `false` | - | Skip verification of TLS certificate |
+| `skip_verify` | -                    | `false` | -                                                                            | Skip verification of TLS certificate |
-| | `SOCKS_PROXY` | *none* | SOCKS5 proxy to use for connections |
+|               | `SOCKS_PROXY`        | _none_  | SOCKS5 proxy to use for connections                                          |
-| | `SOCKS_PROXY_OFF` | *none* | Do not use SOCKS5 proxy |
+|               | `SOCKS_PROXY_OFF`    | _none_  | Do not use SOCKS5 proxy                                                      |
 
 ## Creating plugin
 
@@ -25,7 +25,7 @@ import (
 
 	"codeberg.org/woodpecker-plugins/go-plugin"
 	"github.com/rs/zerolog/log"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 type Settings struct {
@@ -44,7 +44,7 @@ func (p *Plugin) Flags() []cli.Flag {
 		&cli.StringFlag{
 			Name:        "sample.flag",
 			Usage:       "sample flag",
-			EnvVars:     []string{"PLUGIN_SAMPLE_FLAG"},
+			Sources:     cli.EnvVars("PLUGIN_SAMPLE_FLAG"),
 			Destination: &p.Settings.SampleFlag,
 		},
 	}

commit.go

@@ -15,7 +15,7 @@
 package plugin
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 type (
@@ -41,72 +41,109 @@ type (
 	}
 )
 
-func currFlags() []cli.Flag {
+func commitFlags() []cli.Flag {
 	return []cli.Flag{
 		&cli.StringFlag{
-			Name:    "commit.sha",
+			Name:  "commit.sha",
-			Usage:   "commit SHA",
+			Usage: "commit SHA",
-			EnvVars: []string{"CI_COMMIT_SHA", "DRONE_COMMIT", "DRONE_COMMIT_SHA"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_SHA",
+				"DRONE_COMMIT",
+				"DRONE_COMMIT_SHA",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.ref",
+			Name:  "commit.ref",
-			Usage:   "commit ref",
+			Usage: "commit ref",
-			EnvVars: []string{"CI_COMMIT_REF", "DRONE_COMMIT_REF"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_REF",
+				"DRONE_COMMIT_REF",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.refspec",
+			Name:  "commit.refspec",
-			Usage:   "commit refspec",
+			Usage: "commit refspec",
-			EnvVars: []string{"CI_COMMIT_REFSPEC"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_REFSPEC",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.pull-request",
+			Name:  "commit.pull-request",
-			Usage:   "commit pull request",
+			Usage: "commit pull request",
-			EnvVars: []string{"CI_COMMIT_PULL_REQUEST", "DRONE_PULL_REQUEST"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_PULL_REQUEST",
+				"DRONE_PULL_REQUEST",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.source-branch",
+			Name:  "commit.source-branch",
-			Usage:   "commit source branch",
+			Usage: "commit source branch",
-			EnvVars: []string{"CI_COMMIT_SOURCE_BRANCH", "DRONE_SOURCE_BRANCH"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_SOURCE_BRANCH",
+				"DRONE_SOURCE_BRANCH",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.target-branch",
+			Name:  "commit.target-branch",
-			Usage:   "commit target branch",
+			Usage: "commit target branch",
-			EnvVars: []string{"CI_COMMIT_TARGET_BRANCH", "DRONE_TARGET_BRANCH"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_TARGET_BRANCH",
+				"DRONE_TARGET_BRANCH",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.branch",
+			Name:  "commit.branch",
-			Usage:   "commit branch",
+			Usage: "commit branch",
-			EnvVars: []string{"CI_COMMIT_BRANCH", "DRONE_BRANCH"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_BRANCH",
+				"DRONE_BRANCH",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.tag",
+			Name:  "commit.tag",
-			Usage:   "commit tag",
+			Usage: "commit tag",
-			EnvVars: []string{"CI_COMMIT_TAG", "DRONE_TAG"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_TAG",
+				"DRONE_TAG",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.message",
+			Name:  "commit.message",
-			Usage:   "commit message",
+			Usage: "commit message",
-			EnvVars: []string{"CI_COMMIT_MESSAGE", "DRONE_COMMIT_MESSAGE"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_MESSAGE",
+				"DRONE_COMMIT_MESSAGE",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.author.name",
+			Name:  "commit.author.name",
-			Usage:   "commit author name",
+			Usage: "commit author name",
-			EnvVars: []string{"CI_COMMIT_AUTHOR", "DRONE_COMMIT_AUTHOR", "DRONE_COMMIT_AUTHOR_NAME"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_AUTHOR",
+				"DRONE_COMMIT_AUTHOR",
+				"DRONE_COMMIT_AUTHOR_NAME",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.author.email",
+			Name:  "commit.author.email",
-			Usage:   "commit author email",
+			Usage: "commit author email",
-			EnvVars: []string{"CI_COMMIT_AUTHOR_EMAIL", "DRONE_COMMIT_AUTHOR_EMAIL"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_AUTHOR_EMAIL",
+				"DRONE_COMMIT_AUTHOR_EMAIL",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "commit.author.avatar",
+			Name:  "commit.author.avatar",
-			Usage:   "commit author avatar",
+			Usage: "commit author avatar",
-			EnvVars: []string{"CI_COMMIT_AUTHOR_AVATAR", "DRONE_COMMIT_AUTHOR_AVATAR"},
+			Sources: cli.EnvVars(
+				"CI_COMMIT_AUTHOR_AVATAR",
+				"DRONE_COMMIT_AUTHOR_AVATAR",
+			),
 		},
 	}
 }
 
-func currFromContext(c *cli.Context) Commit {
+func commitFromContext(c *cli.Command) Commit {
 	return Commit{
 		Sha:          c.String("commit.sha"),
 		Ref:          c.String("commit.ref"),
@@ -125,52 +162,69 @@ func currFromContext(c *cli.Context) Commit {
 	}
 }
 
-func prevFlags() []cli.Flag {
+func previousCommitFlags() []cli.Flag {
 	return []cli.Flag{
 		&cli.StringFlag{
-			Name:    "prev.commit.sha",
+			Name:  "prev.commit.sha",
-			Usage:   "previous commit SHA",
+			Usage: "previous commit SHA",
-			EnvVars: []string{"CI_PREV_COMMIT_SHA", "DRONE_COMMIT_BEFORE"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_SHA",
+				"DRONE_COMMIT_BEFORE",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.ref",
+			Name:  "prev.commit.ref",
-			Usage:   "previous commit ref",
+			Usage: "previous commit ref",
-			EnvVars: []string{"CI_PREV_COMMIT_REF"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_REF",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.refspec",
+			Name:  "prev.commit.refspec",
-			Usage:   "previous commit refspec",
+			Usage: "previous commit refspec",
-			EnvVars: []string{"CI_PREV_COMMIT_REFSPEC"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_REFSPEC",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.branch",
+			Name:  "prev.commit.branch",
-			Usage:   "previous commit branch",
+			Usage: "previous commit branch",
-			EnvVars: []string{"CI_PREV_COMMIT_BRANCH"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_BRANCH",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.message",
+			Name:  "prev.commit.message",
-			Usage:   "previous commit message",
+			Usage: "previous commit message",
-			EnvVars: []string{"CI_PREV_COMMIT_MESSAGE"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_MESSAGE",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.author.name",
+			Name:  "prev.commit.author.name",
-			Usage:   "previous commit author name",
+			Usage: "previous commit author name",
-			EnvVars: []string{"CI_PREV_COMMIT_AUTHOR"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_AUTHOR",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.author.email",
+			Name:  "prev.commit.author.email",
-			Usage:   "previous commit author email",
+			Usage: "previous commit author email",
-			EnvVars: []string{"CI_PREV_COMMIT_AUTHOR_EMAIL"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_AUTHOR_EMAIL",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "prev.commit.author.avatar",
+			Name:  "prev.commit.author.avatar",
-			Usage:   "previous commit author avatar",
+			Usage: "previous commit author avatar",
-			EnvVars: []string{"CI_PREV_COMMIT_AUTHOR_AVATAR"},
+			Sources: cli.EnvVars(
+				"CI_PREV_COMMIT_AUTHOR_AVATAR",
+			),
 		},
 	}
 }
 
-func prevFromContext(c *cli.Context) Commit {
+func previousCommitFromContext(c *cli.Command) Commit {
 	return Commit{
 		Sha:     c.String("prev.commit.sha"),
 		Ref:     c.String("prev.commit.ref"),

flags.go

@@ -15,7 +15,7 @@
 package plugin
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // Flags has the cli.Flags for the Woodpecker plugin.
@@ -25,8 +25,8 @@ func Flags() []cli.Flag {
 	// Pipeline flags
 	flags = append(flags, repositoryFlags()...)
 	flags = append(flags, pipelineFlags()...)
-	flags = append(flags, currFlags()...)
+	flags = append(flags, commitFlags()...)
-	flags = append(flags, prevFlags()...)
+	flags = append(flags, previousCommitFlags()...)
 	flags = append(flags, stepFlags()...)
 	flags = append(flags, systemFlags()...)
 	flags = append(flags, forgeFlags()...)

flake.lock

@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1720542800,
+        "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,24 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs =
+    { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            go_1_22
+            gofumpt
+            golangci-lint
+          ];
+        };
+      }
+    );
+}

forge.go

@@ -15,11 +15,12 @@
 package plugin
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 const (
 	ForgeTypeGitea     = "gitea"
+	ForgeTypeForgejo   = "forgejo"
 	ForgeTypeGitHub    = "github"
 	ForgeTypeGitLab    = "gitlab"
 	ForgeTypeBitbucket = "bitbucket"
@@ -28,6 +29,9 @@ const (
 // Forge defines metadata for integration with a forge.
 type Forge struct {
 	Type string `json:"type,omitempty"`
+	URL  string `json:"url,omitempty"`
+
+	// Deprecated: Please use URL instead.
 	Link string `json:"link,omitempty"`
 }
 
@@ -35,25 +39,27 @@ func forgeFlags() []cli.Flag {
 	return []cli.Flag{
 		&cli.StringFlag{
 			Name:  "forge.type",
-			Usage: "forge type (gitea, github, gitlab, bitbucker)",
+			Usage: "forge type (gitea, forgejo, github, gitlab, bitbucket)",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_FORGE_TYPE",
-			},
+			),
 		},
 		&cli.StringFlag{
-			Name:  "forge.link",
+			Name:    "forge.url",
-			Usage: "forge link",
+			Aliases: []string{"forge.link"},
-			EnvVars: []string{
+			Usage:   "forge url",
+			Sources: cli.EnvVars(
 				"CI_FORGE_URL",
 				"CI_FORGE_LINK",
-			},
+			),
 		},
 	}
 }
 
-func forgeFromContext(ctx *cli.Context) Forge {
+func forgeFromContext(c *cli.Command) Forge {
 	return Forge{
-		Type: ctx.String("forge.type"),
+		Type: c.String("forge.type"),
-		Link: ctx.String("forge.link"),
+		Link: c.String("forge.url"),
+		URL:  c.String("forge.url"),
 	}
 }

go.mod

@@ -4,20 +4,17 @@ go 1.19
 
 require (
 	github.com/joho/godotenv v1.5.1
-	github.com/rs/zerolog v1.31.0
+	github.com/rs/zerolog v1.33.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
-	github.com/urfave/cli/v2 v2.27.1
+	github.com/urfave/cli/v3 v3.0.0-alpha9.0.20240901123629-31c5c841e98f
-	golang.org/x/net v0.20.0
+	golang.org/x/net v0.29.0
 )
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/sys v0.16.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,84 +1,32 @@
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
-github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
-github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/urfave/cli/v3 v3.0.0-alpha9.0.20240901123629-31c5c841e98f h1:NLtJkwEq8wijGw/t5340pm/SRM2loRQ6m+2IRaM+8eM=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/urfave/cli/v3 v3.0.0-alpha9.0.20240901123629-31c5c841e98f/go.mod h1:Z1ItyMma7t6I7zHG9OpbExhHQOSkFf/96n+mAZ9MtVI=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
-github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
-github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
-github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=
-github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/urfave/cli/v2 v2.27.0 h1:uNs1K8JwTFL84X68j5Fjny6hfANh9nTlJ6dRtZAFAHY=
-github.com/urfave/cli/v2 v2.27.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
-github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

http.go

@@ -23,37 +23,43 @@ import (
 	"time"
 
 	"github.com/rs/zerolog/log"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 	"golang.org/x/net/proxy"
 )
 
 func httpClientFlags() []cli.Flag {
 	return []cli.Flag{
 		&cli.BoolFlag{
-			Name:    "transport.skip-verify",
+			Name:  "transport.skip-verify",
-			Usage:   "skip ssl verify",
+			Usage: "skip ssl verify",
-			EnvVars: []string{"PLUGIN_SKIP_VERIFY"},
+			Sources: cli.EnvVars(
+				"PLUGIN_SKIP_VERIFY",
+			),
 		},
 		&cli.StringFlag{
-			Name:    "transport.socks-proxy",
+			Name:  "transport.socks-proxy",
-			Usage:   "socks proxy address",
+			Usage: "socks proxy address",
-			EnvVars: []string{"SOCKS_PROXY"},
+			Sources: cli.EnvVars(
-			Hidden:  true,
+				"SOCKS_PROXY",
+			),
+			Hidden: true,
 		},
 		&cli.BoolFlag{
-			Name:    "transport.socks-proxy-off",
+			Name:  "transport.socks-proxy-off",
-			Usage:   "socks proxy ignored",
+			Usage: "socks proxy ignored",
-			EnvVars: []string{"SOCKS_PROXY_OFF"},
+			Sources: cli.EnvVars(
-			Hidden:  true,
+				"SOCKS_PROXY_OFF",
+			),
+			Hidden: true,
 		},
 	}
 }
 
-func HTTPClientFromContext(ctx *cli.Context) *http.Client {
+func HTTPClientFromContext(c *cli.Command) *http.Client {
 	var (
-		skip     = ctx.Bool("transport.skip-verify")
+		skip     = c.Bool("transport.skip-verify")
-		socks    = ctx.String("transport.socks-proxy")
+		socks    = c.String("transport.socks-proxy")
-		socksoff = ctx.Bool("transport.socks-proxy-off")
+		socksOff = c.Bool("transport.socks-proxy-off")
 	)
 
 	certs, err := x509.SystemCertPool()
@@ -80,7 +86,7 @@ func HTTPClientFromContext(ctx *cli.Context) *http.Client {
 		DualStack: true,
 	}
 
-	if len(socks) != 0 && !socksoff {
+	if len(socks) != 0 && !socksOff {
 		proxyDialer, err := proxy.SOCKS5("tcp", socks, nil, dialer)
 		if err != nil {
 			log.Error().Err(err).Msg("failed to create socks proxy")
@@ -88,7 +94,7 @@ func HTTPClientFromContext(ctx *cli.Context) *http.Client {
 		if contextDialer, ok := proxyDialer.(proxy.ContextDialer); ok {
 			transport.DialContext = contextDialer.DialContext
 		} else {
-			transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			transport.DialContext = func(_ context.Context, network, addr string) (net.Conn, error) {
 				return proxyDialer.Dial(network, addr)
 			}
 		}

logger.go

@@ -19,22 +19,24 @@ import (
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func loggingFlags() []cli.Flag {
 	return []cli.Flag{
 		&cli.StringFlag{
-			Name:    "log-level",
+			Name:  "log-level",
-			Usage:   "log level",
+			Usage: "log level",
-			EnvVars: []string{"PLUGIN_LOG_LEVEL"},
+			Sources: cli.EnvVars(
-			Value:   "info",
+				"PLUGIN_LOG_LEVEL",
+			),
+			Value: "info",
 		},
 	}
 }
 
 // SetupConsoleLogger sets up the console logger.
-func SetupConsoleLogger(c *cli.Context) error {
+func SetupConsoleLogger(c *cli.Command) error {
 	level := c.String("log-level")
 	lvl, err := zerolog.ParseLevel(level)
 	if err != nil {

metadata.go

@@ -15,29 +15,41 @@
 package plugin
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // Metadata defines runtime metadata.
 type Metadata struct {
-	Repository Repository `json:"repo,omitempty"`
+	Repository     Repository `json:"repo,omitempty"`
-	Pipeline   Pipeline   `json:"curr,omitempty"`
+	Pipeline       Pipeline   `json:"curr,omitempty"`
-	Curr       Commit     `json:"commit,omitempty"`
+	Commit         Commit     `json:"commit,omitempty"`
-	Prev       Commit     `json:"prev,omitempty"`
+	PreviousCommit Commit     `json:"previous_commit,omitempty"`
-	Step       Step       `json:"step,omitempty"`
+	Step           Step       `json:"step,omitempty"`
-	System     System     `json:"sys,omitempty"`
+	System         System     `json:"sys,omitempty"`
-	Forge      Forge      `json:"forge,omitempty"`
+	Forge          Forge      `json:"forge,omitempty"`
+
+	// Deprecated: Please use Commit instead.
+	Curr Commit
+
+	// Deprecated: Please use PreviousCommit instead.
+	Prev Commit `json:"prev,omitempty"`
 }
 
 // MetadataFromContext creates a Metadata from the cli.Context.
-func MetadataFromContext(ctx *cli.Context) Metadata {
+func MetadataFromContext(c *cli.Command) Metadata {
+	commit := commitFromContext(c)
+	previousCommit := previousCommitFromContext(c)
+
 	return Metadata{
-		Repository: repositoryFromContext(ctx),
+		Repository:     repositoryFromContext(c),
-		Pipeline:   pipelineFromContext(ctx),
+		Pipeline:       pipelineFromContext(c),
-		Curr:       currFromContext(ctx),
+		Commit:         commit,
-		Prev:       prevFromContext(ctx),
+		PreviousCommit: previousCommit,
-		Step:       stepFromContext(ctx),
+		Step:           stepFromContext(c),
-		System:     systemFromContext(ctx),
+		System:         systemFromContext(c),
-		Forge:      forgeFromContext(ctx),
+		Forge:          forgeFromContext(c),
+
+		Curr: commit,
+		Prev: previousCommit,
 	}
 }

metadata_test.go

@@ -79,13 +79,13 @@ func TestMetadata(t *testing.T) {
 			return nil
 		},
 	})
-	err := plugin.app.Run([]string{"test"})
+	err := plugin.app.Run(plugin.ctx, []string{"test"})
 	require.NoError(t, err)
 
 	// Repository
 	assert.Equal(t, "woodpecker", plugin.Metadata.Repository.Name)
 	assert.Equal(t, "woodpecker-ci", plugin.Metadata.Repository.Owner)
-	assert.Equal(t, "https://codeberg.org/woodpecker-plugins/go-plugin", plugin.Metadata.Repository.Link)
+	assert.Equal(t, "https://codeberg.org/woodpecker-plugins/go-plugin", plugin.Metadata.Repository.URL)
 	assert.Equal(t, "https://codeberg.org/woodpecker-plugins/go-plugin.git", plugin.Metadata.Repository.CloneURL)
 	assert.Equal(t, "main", plugin.Metadata.Repository.Branch)
 	assert.False(t, plugin.Metadata.Repository.Private)
@@ -103,7 +103,7 @@ func TestMetadata(t *testing.T) {
 	// Pipeline
 	assert.Equal(t, int64(1), plugin.Metadata.Pipeline.Number)
 	assert.Equal(t, EventTypePush, plugin.Metadata.Pipeline.Event)
-	assert.Equal(t, "https://ci.woodpecker-ci.org/woodpecker-ci/woodpecker/1", plugin.Metadata.Pipeline.Link)
+	assert.Equal(t, "https://ci.woodpecker-ci.org/woodpecker-ci/woodpecker/1", plugin.Metadata.Pipeline.URL)
 	assert.Equal(t, "running", plugin.Metadata.Pipeline.Status)
 	assert.Equal(t, time.Unix(1611234567, 0), plugin.Metadata.Pipeline.Created)
 	assert.Equal(t, time.Unix(1611234567, 0), plugin.Metadata.Pipeline.Started)
@@ -114,11 +114,11 @@ func TestMetadata(t *testing.T) {
 
 	// System
 	assert.Equal(t, "woodpecker", plugin.Metadata.System.Name)
-	assert.Equal(t, "https://ci.woodpecker-ci.org", plugin.Metadata.System.Link)
+	assert.Equal(t, "https://ci.woodpecker-ci.org", plugin.Metadata.System.URL)
 	assert.Equal(t, "1.0.0", plugin.Metadata.System.Version)
 	assert.Equal(t, "woodpecker-ci.org", plugin.Metadata.System.Host)
 
 	// Forge
 	assert.Equal(t, ForgeTypeGitea, plugin.Metadata.Forge.Type)
-	assert.Equal(t, "https://codeberg.org", plugin.Metadata.Forge.Link)
+	assert.Equal(t, "https://codeberg.org", plugin.Metadata.Forge.URL)
 }

pipeline.go

@@ -17,7 +17,7 @@ package plugin
 import (
 	"time"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 const (
@@ -34,102 +34,107 @@ type Pipeline struct {
 	Number       int64     `json:"number,omitempty"`
 	Status       string    `json:"status,omitempty"`
 	Event        string    `json:"event,omitempty"`
-	Link         string    `json:"link,omitempty"`
+	URL          string    `json:"url,omitempty"`
 	DeployTarget string    `json:"target,omitempty"`
 	Created      time.Time `json:"created,omitempty"`
 	Started      time.Time `json:"started,omitempty"`
 	Finished     time.Time `json:"finished,omitempty"`
 	Parent       int64     `json:"parent,omitempty"`
+
+	// Deprecated: Please use URL instead.
+	Link string `json:"link,omitempty"`
 }
 
 func pipelineFlags() []cli.Flag {
 	return []cli.Flag{
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "pipeline.number",
 			Usage: "pipeline number",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_NUMBER",
 				"DRONE_BUILD_NUMBER",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "pipeline.status",
 			Usage: "pipeline status",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_STATUS",
 				"DRONE_BUILD_STATUS",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "pipeline.event",
 			Usage: "pipeline event",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_EVENT",
 				"DRONE_BUILD_EVENT",
-			},
+			),
 		},
 		&cli.StringFlag{
-			Name:  "pipeline.link",
+			Name:    "pipeline.url",
-			Usage: "pipeline link",
+			Aliases: []string{"pipeline.link"},
-			EnvVars: []string{
+			Usage:   "pipeline url",
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_URL",
 				"CI_PIPELINE_LINK",
 				"DRONE_BUILD_LINK",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "pipeline.deploy-target",
 			Usage: "pipeline deployment target",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_DEPLOY_TARGET",
 				"DRONE_DEPLOY_TO",
-			},
+			),
 		},
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "pipeline.created",
 			Usage: "pipeline creation time",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_CREATED",
 				"DRONE_BUILD_CREATED",
-			},
+			),
 		},
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "pipeline.started",
 			Usage: "pipeline start time",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_STARTED",
 				"DRONE_BUILD_STARTED",
-			},
+			),
 		},
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "pipeline.finished",
 			Usage: "pipeline finish time",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_FINISHED",
 				"DRONE_BUILD_FINISHED",
-			},
+			),
 		},
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "pipeline.parent",
 			Usage: "pipeline parent",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_PIPELINE_PARENT",
 				"DRONE_BUILD_PARENT",
-			},
+			),
 		},
 	}
 }
 
-func pipelineFromContext(c *cli.Context) Pipeline {
+func pipelineFromContext(c *cli.Command) Pipeline {
 	return Pipeline{
-		Number:       c.Int64("pipeline.number"),
+		Number:       c.Int("pipeline.number"),
 		Status:       c.String("pipeline.status"),
 		Event:        c.String("pipeline.event"),
-		Link:         c.String("pipeline.link"),
+		URL:          c.String("pipeline.url"),
+		Link:         c.String("pipeline.url"),
 		DeployTarget: c.String("pipeline.deploy-target"),
-		Created:      time.Unix(c.Int64("pipeline.created"), 0),
+		Created:      time.Unix(c.Int("pipeline.created"), 0),
-		Started:      time.Unix(c.Int64("pipeline.started"), 0),
+		Started:      time.Unix(c.Int("pipeline.started"), 0),
-		Finished:     time.Unix(c.Int64("pipeline.finished"), 0),
+		Finished:     time.Unix(c.Int("pipeline.finished"), 0),
-		Parent:       c.Int64("pipeline.parent"),
+		Parent:       c.Int("pipeline.parent"),
 	}
 }

plugin.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/joho/godotenv"
 	"github.com/rs/zerolog/log"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // Options defines the options for the plugin.
@@ -36,13 +36,16 @@ type Options struct {
 	Flags []cli.Flag
 	// Execute function of the plugin.
 	Execute ExecuteFunc
+	// Context the plugin will use while executing.
+	Context context.Context
 }
 
 // Plugin defines the plugin instance.
 type Plugin struct {
-	app     *cli.App
+	app     *cli.Command
 	execute ExecuteFunc
 	client  *http.Client
+	ctx     context.Context
 	// Metadata of the current pipeline.
 	Metadata Metadata
 }
@@ -56,8 +59,9 @@ func New(opt Options) *Plugin {
 		_ = godotenv.Overload("/run/woodpecker/env")
 	}
 
-	app := &cli.App{
+	app := &cli.Command{
 		Name:        opt.Name,
+		Usage:       "Run the Woodpecker CI plugin",
 		Description: opt.Description,
 		Version:     opt.Version,
 		Flags:       append(opt.Flags, Flags()...),
@@ -66,25 +70,30 @@ func New(opt Options) *Plugin {
 	plugin := &Plugin{
 		app:     app,
 		execute: opt.Execute,
+		ctx:     opt.Context,
 	}
 	plugin.app.Action = plugin.action
 
+	if plugin.ctx == nil {
+		plugin.ctx = context.Background()
+	}
+
 	return plugin
 }
 
-func (p *Plugin) action(ctx *cli.Context) error {
+func (p *Plugin) action(ctx context.Context, c *cli.Command) error {
-	if err := SetupConsoleLogger(ctx); err != nil {
+	if err := SetupConsoleLogger(c); err != nil {
 		return err
 	}
 
-	p.Metadata = MetadataFromContext(ctx)
+	p.Metadata = MetadataFromContext(c)
-	p.client = HTTPClientFromContext(ctx)
+	p.client = HTTPClientFromContext(c)
 
 	if p.execute == nil {
 		panic("plugin execute function is not set")
 	}
 
-	return p.execute(ctx.Context)
+	return p.execute(ctx)
 }
 
 // HTTPClient returns the http.Client instance.
@@ -94,7 +103,7 @@ func (p *Plugin) HTTPClient() *http.Client {
 
 // Run the plugin.
 func (p *Plugin) Run() {
-	if err := p.app.Run(os.Args); err != nil {
+	if err := p.app.Run(p.ctx, os.Args); err != nil {
 		log.Error().Err(err).Msg("execution failed")
 		os.Exit(1)
 	}

plugin_test.go

@@ -30,7 +30,7 @@ func TestPlugin(t *testing.T) {
 			return nil
 		},
 	})
-	err := p.app.Run([]string{"test"})
+	err := p.app.Run(p.ctx, []string{"test"})
 	assert.NoError(t, err)
 	assert.True(t, executed)
 }

repo.go

@@ -15,80 +15,96 @@
 package plugin
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // Repository defines runtime metadata for a repository.
 type Repository struct {
-	Name     string `json:"name,omitempty"`
+	RemoteID      string `json:"remote_id,omitempty"`
-	Owner    string `json:"owner,omitempty"`
+	Name          string `json:"name,omitempty"`
-	Link     string `json:"link,omitempty"`
+	Owner         string `json:"owner,omitempty"`
-	CloneURL string `json:"clone_url,omitempty"`
+	Link          string `json:"link,omitempty"`
-	Private  bool   `json:"private,omitempty"`
+	URL           string `json:"url,omitempty"`
-	Branch   string `json:"default_branch,omitempty"`
+	CloneURL      string `json:"clone_url,omitempty"`
+	Private       bool   `json:"private,omitempty"`
+	DefaultBranch string `json:"default_branch,omitempty"`
+
+	// Deprecated: Please use DefaultBranch instead.
+	Branch string
 }
 
 func repositoryFlags() []cli.Flag {
 	return []cli.Flag{
+		&cli.StringFlag{
+			Name:  "repo.remote-id",
+			Usage: "repo remote id",
+			Sources: cli.EnvVars(
+				"CI_REPO_REMOTE_ID",
+			),
+		},
 		&cli.StringFlag{
 			Name:  "repo.name",
 			Usage: "repo name",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_REPO_NAME",
 				"DRONE_REPO_NAME",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "repo.owner",
 			Usage: "repo owner",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_REPO_OWNER",
 				"DRONE_REPO_OWNER",
-			},
+			),
 		},
 		&cli.StringFlag{
-			Name:  "repo.link",
+			Name:    "repo.url",
-			Usage: "repo link",
+			Aliases: []string{"repo.link"},
-			EnvVars: []string{
+			Usage:   "repo url",
+			Sources: cli.EnvVars(
 				"CI_REPO_URL",
 				"CI_REPO_LINK",
 				"DRONE_REPO_LINK",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "repo.clone-url",
 			Usage: "repo clone url",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_REPO_CLONE_URL",
 				"DRONE_GIT_HTTP_URL",
-			},
+			),
 		},
 		&cli.BoolFlag{
 			Name:  "repo.private",
 			Usage: "repo private",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_REPO_PRIVATE",
 				"DRONE_REPO_PRIVATE",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "repo.default-branch",
 			Usage: "repo default branch",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_REPO_DEFAULT_BRANCH",
 				"DRONE_REPO_BRANCH",
-			},
+			),
 		},
 	}
 }
 
-func repositoryFromContext(c *cli.Context) Repository {
+func repositoryFromContext(c *cli.Command) Repository {
 	return Repository{
-		Name:     c.String("repo.name"),
+		RemoteID:      c.String("repo.remote-id"),
-		Owner:    c.String("repo.owner"),
+		Name:          c.String("repo.name"),
-		Link:     c.String("repo.link"),
+		Owner:         c.String("repo.owner"),
-		CloneURL: c.String("repo.clone-url"),
+		URL:           c.String("repo.url"),
-		Private:  c.Bool("repo.private"),
+		Link:          c.String("repo.url"),
-		Branch:   c.String("repo.default-branch"),
+		CloneURL:      c.String("repo.clone-url"),
+		Private:       c.Bool("repo.private"),
+		Branch:        c.String("repo.default-branch"),
+		DefaultBranch: c.String("repo.default-branch"),
 	}
 }

step.go

@@ -17,7 +17,7 @@ package plugin
 import (
 	"time"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // Step defines runtime metadata for a step.
@@ -32,32 +32,32 @@ func stepFlags() []cli.Flag {
 		&cli.IntFlag{
 			Name:  "step.number",
 			Usage: "step number",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_STEP_NUMBER",
 				"DRONE_STEP_NUMBER",
-			},
+			),
 		},
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "step.started",
 			Usage: "step start time",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_STEP_STARTED",
-			},
+			),
 		},
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "step.finished",
 			Usage: "step finish time",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_STEP_FINISHED",
-			},
+			),
 		},
 	}
 }
 
-func stepFromContext(c *cli.Context) Step {
+func stepFromContext(c *cli.Command) Step {
 	return Step{
-		Number:   c.Int("step.number"),
+		Number:   int(c.Int("step.number")),
-		Started:  time.Unix(c.Int64("step.started"), 0),
+		Started:  time.Unix(c.Int("step.started"), 0),
-		Finished: time.Unix(c.Int64("step.finished"), 0),
+		Finished: time.Unix(c.Int("step.finished"), 0),
 	}
 }

system.go

@@ -17,16 +17,19 @@ package plugin
 import (
 	"os"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // System defines runtime metadata for a ci/cd system.
 type System struct {
 	Name     string `json:"name,omitempty"`
 	Host     string `json:"host,omitempty"`
-	Link     string `json:"link,omitempty"`
 	Platform string `json:"arch,omitempty"`
 	Version  string `json:"version,omitempty"`
+	URL      string `json:"url,omitempty"`
+
+	// Deprecated: Please use URL instead.
+	Link string `json:"link,omitempty"`
 }
 
 func systemFlags() []cli.Flag {
@@ -34,61 +37,63 @@ func systemFlags() []cli.Flag {
 		&cli.StringFlag{
 			Name:  "system.name",
 			Usage: "system name",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_SYSTEM_NAME",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "system.host",
 			Usage: "system host",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_SYSTEM_HOST",
 				"DRONE_SYSTEM_HOST",
 				"DRONE_SYSTEM_HOSTNAME",
-			},
+			),
 		},
 		&cli.StringFlag{
-			Name:  "system.link",
+			Name:    "system.url",
-			Usage: "system link",
+			Aliases: []string{"system.link"},
-			EnvVars: []string{
+			Usage:   "system url",
+			Sources: cli.EnvVars(
 				"CI_SYSTEM_URL",
 				"CI_SYSTEM_LINK",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "system.arch",
 			Usage: "system arch",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_SYSTEM_PLATFORM",
 				"DRONE_STAGE_ARCH",
-			},
+			),
 		},
 		&cli.StringFlag{
 			Name:  "system.version",
 			Usage: "system version",
-			EnvVars: []string{
+			Sources: cli.EnvVars(
 				"CI_SYSTEM_VERSION",
 				"DRONE_SYSTEM_VERSION",
-			},
+			),
 		},
 	}
 }
 
-func systemFromContext(ctx *cli.Context) System {
+func systemFromContext(c *cli.Command) System {
-	link := ctx.String("system.link")
+	url := c.String("system.url")
-	host := ctx.String("system.host")
+	host := c.String("system.host")
-	if link == "" && host != "" {
+	if url == "" && host != "" {
-		// Alternative link format used by Drone.
+		// Alternative url format used by Drone.
 		proto := os.Getenv("DRONE_SYSTEM_PROTO")
 		if proto != "" {
-			link = proto + "://" + host
+			url = proto + "://" + host
 		}
 	}
 	return System{
-		Name:     ctx.String("system.name"),
+		Name:     c.String("system.name"),
 		Host:     host,
-		Link:     link,
+		URL:      url,
-		Platform: ctx.String("system.arch"),
+		Link:     url,
-		Version:  ctx.String("system.version"),
+		Platform: c.String("system.arch"),
+		Version:  c.String("system.version"),
 	}
 }