From be0e4ab1795374b8321cd0dc5b8bf97c83d73128 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 13 Dec 2022 14:01:20 +0000 Subject: [PATCH] Enterprise checks: Update pull request check `regexp` for enterprise (#60234) Update pull request check regexp for enterprise --- pkg/build/cmd/genversions_test.go | 1 + pkg/build/config/version.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/build/cmd/genversions_test.go b/pkg/build/cmd/genversions_test.go index 1039c04c89e..1345c8c4e4e 100644 --- a/pkg/build/cmd/genversions_test.go +++ b/pkg/build/cmd/genversions_test.go @@ -33,6 +33,7 @@ func TestGetMetadata(t *testing.T) { {map[string]string{DroneBuildEvent: config.PullRequest, DroneTargetBranch: "", DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.PullRequestMode}}, {map[string]string{DroneBuildEvent: config.Push, DroneTargetBranch: versionedBranch, DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.ReleaseBranchMode}}, {map[string]string{DroneBuildEvent: config.Push, DroneTargetBranch: config.MainBranch, DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.MainMode}}, + {map[string]string{DroneBuildEvent: config.Push, DroneTargetBranch: "prc-12345-foo/bar", DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.PullRequestMode}}, {map[string]string{DroneBuildEvent: config.Custom, DroneTargetBranch: versionedBranch, DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.ReleaseBranchMode}}, {map[string]string{DroneBuildEvent: config.Custom, DroneTargetBranch: config.MainBranch, DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.DownstreamMode}}, {map[string]string{DroneBuildEvent: config.Custom, DroneTargetBranch: config.MainBranch, DroneTag: "", DroneSemverPrerelease: "", DroneBuildNumber: "12345", Edition: "enterprise2"}, hashedGrafanaVersion, config.ReleaseMode{Mode: config.Enterprise2Mode}}, diff --git a/pkg/build/config/version.go b/pkg/build/config/version.go index fa8c8b3555b..aaeeaf56652 100644 --- a/pkg/build/config/version.go +++ b/pkg/build/config/version.go @@ -7,6 +7,8 @@ import ( "path/filepath" "regexp" "strings" + + "github.com/grafana/grafana/pkg/build/git" ) type Metadata struct { @@ -100,8 +102,8 @@ func GetGrafanaVersion(buildID, grafanaDir string) (string, error) { } func CheckDroneTargetBranch() (VersionMode, error) { + rePRCheckBranch := git.PRCheckRegexp() reRlsBranch := regexp.MustCompile(`^v\d+\.\d+\.x$`) - rePRCheckBranch := regexp.MustCompile(`^pr-check-\d+`) target := os.Getenv("DRONE_TARGET_BRANCH") if target == "" { return "", fmt.Errorf("failed to get DRONE_TARGET_BRANCH environmental variable")