Merge pull request #348 from mozilla/3.0.5

release 3.0.5

.travis.yml

@@ -25,6 +25,14 @@ before_deploy:
   - GOOS=darwin CGO_ENABLED=0 go build -o dist/sops-${TRAVIS_TAG}.darwin go.mozilla.org/sops/cmd/sops
   - GOOS=windows CGO_ENABLED=0 go build -o dist/sops-${TRAVIS_TAG}.exe go.mozilla.org/sops/cmd/sops
   - GOOS=linux CGO_ENABLED=0 go build -o dist/sops-${TRAVIS_TAG}.linux go.mozilla.org/sops/cmd/sops
+  - |
+      if [ ! -z "$TRAVIS_TAG" ]; then
+        version="$(grep '^const version' cmd/sops/version.go |cut -d '"' -f 2)"
+        if [ "$version" != "$TRAVIS_TAG" ]; then
+            echo "Git tag $TRAVIS_TAG does not match version $version, update the source!"
+            exit 1
+        fi
+      fi
 
 deploy:
   provider: releases

CHANGELOG.rst

@@ -1,6 +1,19 @@
 Changelog
 =========
 
+3.0.5
+-----
+
+* Prevent files from being encrypted twice
+
+* Fix empty comments not being decrypted correctly
+
+* If keyservicecmd returns an error, log it.
+
+* Initial sops workspace auditing support (still wip)
+
+* Refactor Store interface to reflect operations SOPS performs
+
 3.0.3
 ----
 

cmd/sops/version.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/urfave/cli.v1"
 )
 
-const version = "3.0.3"
+const version = "3.0.5"
 
 func printVersion(c *cli.Context) {
 	out := fmt.Sprintf("%s %s", c.App.Name, c.App.Version)