Stream script output and deploy on master or tags (#4)

siderolabs · Jun 5, 2017 · 92643d5 · 92643d5
1 parent 81055ed
commit 92643d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,5 +28,4 @@ deploy:
   script: scripts/deploy.sh
   skip_cleanup: true
   on:
-    tags: true
-    branch: master
+    condition: $TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG
diff --git a/conform/enforce.go b/conform/enforce.go
@@ -122,10 +122,15 @@ func (e *Enforcer) ExtractArtifact(artifact string) error {
 // ExecuteScript executes a script for a rule.
 func (e *Enforcer) ExecuteScript(script string) error {
 	if s, ok := e.config.Scripts[script]; ok {
-		log.Printf("Running %s script", script)
-		out, err := exec.Command("bash", "-c", s).Output()
+		log.Printf("Running %q script", script)
+
+		command := exec.Command("bash", "-c", s)
+		command.Stdout = os.Stdout
+		command.Stderr = os.Stderr
+		command.Start()
+		err := command.Wait()
 		if err != nil {
-			return fmt.Errorf("Failed executing %s: %v\n%s", script, err, out)
+			return fmt.Errorf("Failed executing %q: %v", script, err)
 		}
 
 		return nil