Merge upstream

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v2.18.0](https://github.com/harness/drone/tree/v2.18.0) (2023-07-04)
+
+[Full Changelog](https://github.com/harness/drone/compare/v2.17.0...v2.18.0)
+
+**Implemented enhancements:**
+
+- support custom pipeline message [\#3294](https://github.com/harness/drone/pull/3294) ([zc2638](https://github.com/zc2638))
+
+**Fixed bugs:**
+
+- bump drone-ui to 2.11.2 [\#3327](https://github.com/harness/drone/pull/3327) ([d1wilko](https://github.com/d1wilko))
+- Fix comment errors [\#3302](https://github.com/harness/drone/pull/3302) ([weidongkl](https://github.com/weidongkl))
+
 ## [v2.17.0](https://github.com/harness/drone/tree/v2.17.0) (2023-04-25)
 
 [Full Changelog](https://github.com/harness/drone/compare/v2.16.0...v2.17.0)
@@ -17,6 +30,7 @@
 
 **Merged pull requests:**
 
+- release prep for v2.17.0 [\#3316](https://github.com/harness/drone/pull/3316) ([eoinmcafee00](https://github.com/eoinmcafee00))
 - bump drone-ui to 2.11.1 [\#3315](https://github.com/harness/drone/pull/3315) ([d1wilko](https://github.com/d1wilko))
 - bump drone-ui to 2.11.0 [\#3313](https://github.com/harness/drone/pull/3313) ([d1wilko](https://github.com/d1wilko))
 - bump drone-ui to 2.10.0 [\#3311](https://github.com/harness/drone/pull/3311) ([d1wilko](https://github.com/d1wilko))

core/linker.go

@@ -16,7 +16,7 @@ package core
 
 import "context"
 
-// Linker provides a deep link to to a git resource in the
+// Linker provides a deep link to a git resource in the
 // source control management system for a given build.
 type Linker interface {
 	Link(ctx context.Context, repo, ref, sha string) (string, error)

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
 	github.com/drone/drone-go v1.7.2-0.20220308165842-f9e4fe31c2af
 	github.com/drone/drone-runtime v1.1.1-0.20200623162453-61e33e2cab5d
-	github.com/drone/drone-ui v2.11.1+incompatible
+	github.com/drone/drone-ui v2.11.2+incompatible
 	github.com/drone/drone-yaml v1.2.4-0.20220204000225-01fb17858c9b
 	github.com/drone/envsubst v1.0.3-0.20200709231038-aa43e1c1a629
 	github.com/drone/funcmap v0.0.0-20210823160631-9e9dec149056

go.sum

@@ -86,8 +86,8 @@ github.com/drone/drone-go v1.7.2-0.20220308165842-f9e4fe31c2af/go.mod h1:fxCf9jA
 github.com/drone/drone-runtime v1.0.7-0.20190729202838-87c84080f4a1/go.mod h1:+osgwGADc/nyl40J0fdsf8Z09bgcBZXvXXnLOY48zYs=
 github.com/drone/drone-runtime v1.1.1-0.20200623162453-61e33e2cab5d h1:P5HI/Y9hARTZ3F3EKs0kYijhjXZWQRQHYn1neTi0pWM=
 github.com/drone/drone-runtime v1.1.1-0.20200623162453-61e33e2cab5d/go.mod h1:4/2QToW5+HGD0y1sTw7X35W1f7YINS14UfDY4isggT8=
-github.com/drone/drone-ui v2.11.1+incompatible h1:2x5p48p2Ut+MIz/zvGSUIIgLuee4yES0gCTXycAJ1P8=
-github.com/drone/drone-ui v2.11.1+incompatible/go.mod h1:NBtVWW7NNJpD9+huMD/5TAE1db2nrEh0i35/9Rf1MPI=
+github.com/drone/drone-ui v2.11.2+incompatible h1:EiLfxz2CBQnpptWoDEUI/XECxZq9Iuo8MzO8dKl3sBw=
+github.com/drone/drone-ui v2.11.2+incompatible/go.mod h1:NBtVWW7NNJpD9+huMD/5TAE1db2nrEh0i35/9Rf1MPI=
 github.com/drone/drone-yaml v1.2.4-0.20220204000225-01fb17858c9b h1:NU8JZ2Py6dLa5kktIvcsQ5sokdDbvjL8GUOYEU53Wfk=
 github.com/drone/drone-yaml v1.2.4-0.20220204000225-01fb17858c9b/go.mod h1:QsqliFK8nG04AHFN9tTn9XJomRBQHD4wcejWW1uz/10=
 github.com/drone/envsubst v1.0.3-0.20200709231038-aa43e1c1a629 h1:rIaZZalMGGPb2cU/+ypuggZ8aMlpa17RUlJUtsMv8pw=

handler/api/repos/builds/create.go

@@ -40,6 +40,7 @@ func HandleCreate(
 			name      = chi.URLParam(r, "name")
 			sha       = r.FormValue("commit")
 			branch    = r.FormValue("branch")
+			message   = r.FormValue("message")
 			user, _   = request.UserFrom(ctx)
 		)
 
@@ -93,6 +94,9 @@ func HandleCreate(
 			Sender:       user.Login,
 			Params:       map[string]string{},
 		}
+		if len(message) > 0 {
+			hook.Message = message
+		}
 
 		for key, value := range r.URL.Query() {
 			if key == "access_token" ||

version/version.go

@@ -25,7 +25,7 @@ var (
 	// VersionMajor is for an API incompatible changes.
 	VersionMajor int64 = 2
 	// VersionMinor is for functionality in a backwards-compatible manner.
-	VersionMinor int64 = 17
+	VersionMinor int64 = 18
 	// VersionPatch is for backwards-compatible bug fixes.
 	VersionPatch int64 = 2
 	// VersionPre indicates prerelease.

version/version_test.go

@@ -10,7 +10,7 @@ package version
 import "testing"
 
 func TestVersion(t *testing.T) {
-	if got, want := Version.String(), "2.17.0"; got != want {
+	if got, want := Version.String(), "2.18.0"; got != want {
 		t.Errorf("Want version %s, got %s", want, got)
 	}
 }