diff --git a/.ci/before_script.sh b/.ci/before_script.sh index efb1b15c..6edf19c8 100644 --- a/.ci/before_script.sh +++ b/.ci/before_script.sh @@ -19,7 +19,7 @@ function install_ansible { # Mac: if [[ "$GITSECRET_DIST" == "brew" ]]; then - brew install "$GITSECRET_GPG_DEP" + brew install gnupg brew install gawk fi diff --git a/.ci/script.sh b/.ci/script.sh index 509541c1..26c86e9b 100644 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -16,7 +16,7 @@ function run_kitchen_tests { if [[ "$GITSECRET_DIST" == "brew" ]]; then # Only running `make test` on standard (non-docker) build, # since it is called inside the docker container anyway. - PATH="/usr/local/opt/$GITSECRET_GPG_DEP/libexec/gpgbin:$PATH" make test + make test fi # Linux: diff --git a/.travis.yml b/.travis.yml index e20540ef..1f9686fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,11 +78,7 @@ matrix: language: ruby rvm: 2.4 - os: osx - env: GITSECRET_DIST="brew"; GITSECRET_GPG_DEP="gnupg@1.4" - sudo: false - language: generic - - os: osx - env: GITSECRET_DIST="brew"; GITSECRET_GPG_DEP="gnupg@2.0" + env: GITSECRET_DIST="brew" sudo: false language: generic