fix(*): use commit SHA on master and tag name on tags (#98)

siderolabs · May 20, 2018 · 2bd7b89 · 2bd7b89
1 parent 65c2c32
commit 2bd7b89
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.conform.yaml b/.conform.yaml
@@ -33,6 +33,8 @@ script:
     cd ../generate && conform enforce
     cd ../
 
-    {{ if or (and .Git.IsClean .Git.IsTag) (and .Git.IsClean (eq .Git.Branch "master")) }}
-    packer build -var 'version={{ .Docker.Image.Tag }}' packer.json
+    {{ if and .Git.IsClean .Git.IsTag }}
+    packer build -var 'version={{ .Git.Tag }}' packer.json
+    {{ else if and .Git.IsClean (eq .Git.Branch "master") }}
+    packer build -var 'version={{ .Git.SHA }}' packer.json
     {{ end }}