ignore snap.login, do not rely on custom git vars anymore

atomicptr · Mar 30, 2020 · b5ed3ea · b5ed3ea
1 parent 2782598
commit b5ed3ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /crab*
 /main*
 /dist
+/snap.login
 
 # Created by https://www.gitignore.io/api/go,linux,macos,windows,intellij+all,visualstudiocode
 # Edit at https://www.gitignore.io/?templates=go,linux,macos,windows,intellij+all,visualstudiocode

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,8 +1,8 @@
 builds:
 - main: ./cmd/crab/main.go
   ldflags:
-    - -X github.com/atomicptr/crab/pkg/meta.Version={{.Env.GIT_VERSION}}
-    - -X github.com/atomicptr/crab/pkg/meta.GitCommit={{.Env.GIT_COMMIT}}
+    - -X github.com/atomicptr/crab/pkg/meta.Version={{.Version}}
+    - -X github.com/atomicptr/crab/pkg/meta.GitCommit={{.FullCommit}}
   env:
     - CGO_ENABLED=0
   goos:

diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ after_success:
 deploy:
   - provider: script
     skip_cleanup: true
-    script: GIT_COMMIT=$(git rev-list -1 HEAD) GIT_VERSION=$(git --no-pager tag --points-at HEAD | head -n 1) curl -sL https://git.io/goreleaser | bash
+    script: curl -sL https://git.io/goreleaser | bash
     on:
       tags: true
       condition: "$TRAVIS_OS_NAME = linux"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     /crab*
     /main*
     /dist
+    /snap.login
     # Created by https://www.gitignore.io/api/go,linux,macos,windows,intellij+all,visualstudiocode
     # Edit at https://www.gitignore.io/?templates=go,linux,macos,windows,intellij+all,visualstudiocode
@@ Expand Down @@