Browse Source

Move check of push ref before sync of repo

Brendan Abolivier 6 years ago
parent
commit
a709690d90
Signed by: Brendan Abolivier <contact@brendanabolivier.com> GPG key ID: 8EF1500759F70623
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      src/pusher/webhook.go

+ 5
- 5
src/pusher/webhook.go View File

34
 	// Process the payload using the right structure
34
 	// Process the payload using the right structure
35
 	pl := payload.(gitlab.PushEventPayload)
35
 	pl := payload.(gitlab.PushEventPayload)
36
 
36
 
37
-	// Clone or pull the repository
38
-	if _, err = git.Sync(cfg.Git); err != nil {
39
-		panic(err)
40
-	}
41
-
42
 	// Only push changes made on master to Grafana
37
 	// Only push changes made on master to Grafana
43
 	if pl.Ref != "refs/heads/master" {
38
 	if pl.Ref != "refs/heads/master" {
44
 		return
39
 		return
45
 	}
40
 	}
46
 
41
 
42
+	// Clone or pull the repository
43
+	if _, err = git.Sync(cfg.Git); err != nil {
44
+		panic(err)
45
+	}
46
+
47
 	// Files to push are stored in a map before being pushed to the Grafana API.
47
 	// Files to push are stored in a map before being pushed to the Grafana API.
48
 	// We don't push them in the loop iterating over commits because, in the
48
 	// We don't push them in the loop iterating over commits because, in the
49
 	// case a file is successively updated by two commits pushed at the same
49
 	// case a file is successively updated by two commits pushed at the same