Archives/git-secret
2
1
Fork 0
mirror of https://github.com/sobolevn/git-secret synced 2024-11-14 18:13:01 +00:00
Code Issues Projects Releases Wiki Activity

travis-ci changes: remove ansible v2.3, fix brew build issue

Browse Source 
* remove ansible avm v2.3 pip install
* work around perlbrew/build issue #305 with 'brew update' before installs
This commit is contained in:
Josh Rabinowitz 2019-01-11 10:14:22 -05:00 committed by GitHub
parent 2047a0f11b
commit 711a6889c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.ci/ansible-setup.sh
View File

@ -7,14 +7,10 @@ set -e
# What version of avm setup to use # What version of avm setup to use
echo "Setting up Ansible Version Manager" echo "Setting up Ansible Version Manager"
AVM_VERSION="v1.0.0" AVM_VERSION="v1.0.0"
## Install Ansible 2.3.1 using pip and label it 'v2.3'
export ANSIBLE_VERSIONS_0="2.3.1.0"
export INSTALL_TYPE_0="pip"
export ANSIBLE_LABEL_0="v2.3"
## Install Ansible 2.5.X using pip and label it 'v2.5' ## Install Ansible 2.5.X using pip and label it 'v2.5'
export ANSIBLE_VERSIONS_1="2.5.0.0" export ANSIBLE_VERSIONS_0="2.5.0.0"
export INSTALL_TYPE_1="pip" export INSTALL_TYPE_0="pip"
export ANSIBLE_LABEL_1="v2.5" export ANSIBLE_LABEL_0="v2.5"
# Whats the default version # Whats the default version
export ANSIBLE_DEFAULT_VERSION="v2.5" export ANSIBLE_DEFAULT_VERSION="v2.5"

3
.ci/before_script.sh
View File

@ -11,13 +11,14 @@ function update_linux() {
function install_ansible { function install_ansible {
bash .ci/ansible-setup.sh bash .ci/ansible-setup.sh
# pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error # pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error
~/.avm/v2.3/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1
~/.avm/v2.5/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1 ~/.avm/v2.5/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1
} }
# Mac: # Mac:
if [[ "$GITSECRET_DIST" == "brew" ]]; then if [[ "$GITSECRET_DIST" == "brew" ]]; then
brew update
gnupg_installed="$(brew list | grep -c "gnupg")" gnupg_installed="$(brew list | grep -c "gnupg")"
[[ "$gnupg_installed" -ge 1 ]] || brew install gnupg [[ "$gnupg_installed" -ge 1 ]] || brew install gnupg
if [[ -f "/usr/local/bin/gpg1" ]]; then if [[ -f "/usr/local/bin/gpg1" ]]; then