Refspec had the source and target branches already. Now they got their dedicated vars

This commit is contained in:
Laszlo Fogas 2019-10-24 11:39:14 +02:00
parent 85d8b16f90
commit 3c8e95f230
2 changed files with 17 additions and 11 deletions

View file

@ -6,9 +6,6 @@ pipeline:
test:
image: golang:1.12.4
commands:
- echo $CI_COMMIT_REF
- echo $CI_COMMIT_REFSPEC
- echo $DRONE_BRANCH
- go test -cover -timeout 30s $(go list ./...)
test_postgres:

View file

@ -164,15 +164,24 @@ func (m *Metadata) EnvironDrone() map[string]string {
var (
owner string
name string
sourceBranch string
targetBranch string
parts = strings.Split(m.Repo.Name, "/")
repoParts = strings.Split(m.Repo.Name, "/")
branchParts = strings.Split(m.Curr.Commit.Refspec, ":")
)
if len(parts) == 2 {
owner = strings.Split(m.Repo.Name, "/")[0]
name = strings.Split(m.Repo.Name, "/")[1]
if len(repoParts) == 2 {
owner = repoParts[0]
name = repoParts[1]
} else {
name = m.Repo.Name
}
if len(branchParts) == 2 {
sourceBranch = branchParts[0]
targetBranch = branchParts[1]
}
params := map[string]string{
"CI": "drone",
"DRONE": "true",
@ -205,8 +214,8 @@ func (m *Metadata) EnvironDrone() map[string]string {
"DRONE_JOB_NUMBER": fmt.Sprintf("%d", m.Job.Number),
"DRONE_JOB_STARTED": fmt.Sprintf("%d", m.Curr.Started), // ISSUE: no job started
"DRONE_BRANCH": m.Curr.Commit.Branch,
"DRONE_TARGET_BRANCH": m.Curr.Commit.Branch,
"DRONE_SOURCE_BRANCH": m.Curr.Commit.Branch,
"DRONE_SOURCE_BRANCH": sourceBranch,
"DRONE_TARGET_BRANCH": targetBranch,
"DRONE_COMMIT": m.Curr.Commit.Sha,
"DRONE_VERSION": m.Sys.Version,
"DRONE_DEPLOY_TO": m.Curr.Target,