Skip to content

Commit 00e2492

Browse files
Vishal VaibhavGitHub Enterprise
authored andcommitted
fixes for pr raised other than master (#23)
1 parent 13ac18e commit 00e2492

4 files changed

Lines changed: 4 additions & 13 deletions

File tree

.vela.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ steps:
4444
commands:
4545
- make format
4646
ruleset:
47-
branch:
48-
- master
4947
event:
5048
- pull_request
5149

@@ -55,32 +53,24 @@ steps:
5553
commands:
5654
- golangci-lint run
5755
ruleset:
58-
branch:
59-
- master
6056
event:
6157
- pull_request
6258

6359
- name : build-on-pr
6460
<<: *build
6561
ruleset:
66-
branch:
67-
- master
6862
event:
6963
- pull_request
7064

7165
- name: check-pr-code-coverage
7266
<<: *check-pr-code-coverage
7367
ruleset:
74-
branch:
75-
- master
7668
event:
7769
- pull_request
7870

7971
- name: docker-pull-request
8072
image: docker.target.com/vela-plugins/docker:v0.2.3-1
8173
ruleset:
82-
branch:
83-
- master
8474
event:
8575
- pull_request
8676
secrets: [ docker_password ]

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
5656
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5757
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5858
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
59+
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
5960
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
6061
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
6162
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/plugin/runner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ func NewRunner() *DefaultRunner {
2424
return &DefaultRunner{}
2525
}
2626

27-
//Run ...
28-
//nolint: gocyclo
27+
// Run ...
28+
// nolint: gocyclo
2929
func (*DefaultRunner) Run(propertyGetter func(string) (string, bool), changedSourceLinesSource io.Reader, reportDefaultOut io.Writer) error {
3030

3131
rawSourceDirs, found := getActiveEnvVariable(propertyGetter, "PLUGIN_SOURCE_DIRS", "PARAMETER_SOURCE_DIRS")

scripts/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set -x
3232

3333
PLUGIN_MODULE="${PLUGIN_MODULE:-}"
3434
PLUGIN_RUN_DIR="${PLUGIN_RUN_DIR:-}"
35-
branch="$(get_env_var "${DRONE_BRANCH:-}" "${REPOSITORY_BRANCH:-}")"
35+
branch="$(get_env_var "${DRONE_BRANCH:-}" "${VELA_PULL_REQUEST_TARGET:-}")"
3636

3737
git config --global user.name "drone"
3838
git config --global user.email "drone@drone.shipt.com"

0 commit comments

Comments
 (0)