Merge branch 'master' into detect-gpg-error-136

.travis.yml

@@ -8,25 +8,25 @@ matrix:
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg1-debian-latest"; GITSECRET_DIST="deb"
+      env: KITCHEN_REGEXP="gnupg1-debian-latest"
       services: docker
       sudo: required
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg1-fedora-latest"; GITSECRET_DIST="rpm"
+      env: KITCHEN_REGEXP="gnupg1-fedora-latest"
       services: docker
       sudo: required
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg1-ubuntu-latest"; GITSECRET_DIST="deb"
+      env: KITCHEN_REGEXP="gnupg1-ubuntu-latest"
       services: docker
       sudo: required
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg1-ubuntu-rolling"; GITSECRET_DIST="deb"
+      env: KITCHEN_REGEXP="gnupg1-ubuntu-rolling"
       services: docker
       sudo: required
       language: ruby
@@ -50,13 +50,13 @@ matrix:
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg2-centos-latest"; GITSECRET_DIST="rpm"
+      env: KITCHEN_REGEXP="gnupg2-centos-latest"
       services: docker
       sudo: required
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg2-ubuntu-rolling"; GITSECRET_DIST="deb"
+      env: KITCHEN_REGEXP="gnupg2-ubuntu-rolling"
       services: docker
       sudo: required
       language: ruby
@@ -68,13 +68,13 @@ matrix:
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg-git-fedora-latest"; GITSECRET_DIST="make"
+      env: KITCHEN_REGEXP="gnupg-git-fedora-latest"
       services: docker
       sudo: required
       language: ruby
       rvm: 2.4
     - os: linux
-      env: KITCHEN_REGEXP="gnupg-git-ubuntu-rolling"; GITSECRET_DIST="make"
+      env: KITCHEN_REGEXP="gnupg-git-ubuntu-rolling"
       services: docker
       sudo: required
       language: ruby