travis final fix

pull/48/head
sobolevn 8 years ago
parent a4d1b56925
commit 66b326a077
No known key found for this signature in database
GPG Key ID: FF672D568AE3C73E

@ -18,10 +18,12 @@ fi
# Local linux (standart build): # Local linux (standart build):
if [[ "$GITSECRET_DIST" == "none" ]]; then if [[ "$GITSECRET_DIST" == "none" ]]; then
sudo apt-get update if [[ "$GITSECRET_LINT" == 'lint' ]]; then
sudo apt-get update
# Installing linter: # Installing linter:
sudo apt-get install -y shellcheck sudo apt-get install -y shellcheck
fi
if [[ "$GITSECRET_GPG_DEP" == "gnupg2" ]]; then if [[ "$GITSECRET_GPG_DEP" == "gnupg2" ]]; then
# Installing custom GPG version: # Installing custom GPG version:

@ -21,7 +21,7 @@ if [[ -z "$DOCKER_DIST" ]]; then
make test make test
fi fi
if [[ "$GITSECRET_DIST" == 'none' ]]; then if [[ "$GITSECRET_LINT" == 'lint' ]]; then
# If running a native build, do a lint: # If running a native build with lint param, do a lint:
find src -type f -name '*.sh' -print0 | xargs -0 -I {} shellcheck {} find src -type f -name '*.sh' -print0 | xargs -0 -I {} shellcheck {}
fi fi

@ -17,7 +17,7 @@ matrix:
sudo: required sudo: required
language: ruby language: ruby
- os: linux - os: linux
env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg" env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg"; GITSECRET_LINT="lint"
sudo: required sudo: required
language: ruby language: ruby
addons: addons:
@ -30,12 +30,6 @@ matrix:
env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg2"; SECRETS_GPG_COMMAND="gpg2" env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg2"; SECRETS_GPG_COMMAND="gpg2"
sudo: required sudo: required
language: ruby language: ruby
addons:
apt:
sources:
- debian-sid
packages:
- shellcheck
- os: osx - os: osx
env: GITSECRET_DIST="brew"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg" env: GITSECRET_DIST="brew"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg"
sudo: false sudo: false

Loading…
Cancel
Save