Archives/git-secret
2
1
Fork 0
mirror of https://github.com/sobolevn/git-secret synced 2024-11-08 19:10:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'dist/master'

Browse Source
This commit is contained in:
joshr 2020-01-17 06:04:11 -05:00
commit 5b74d5789b
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/ansible-setup.sh
View File

@ -8,11 +8,11 @@ set -e
echo "Setting up Ansible Version Manager" echo "Setting up Ansible Version Manager"
AVM_VERSION="v1.0.0" AVM_VERSION="v1.0.0"
## Install Ansible using pip and label it ## Install Ansible using pip and label it
export ANSIBLE_VERSIONS_0="2.8.4.0" export ANSIBLE_VERSIONS_0="2.9.2.0"
export INSTALL_TYPE_0="pip" export INSTALL_TYPE_0="pip"
export ANSIBLE_LABEL_0="v2.8" export ANSIBLE_LABEL_0="v2.9"
# Whats the default version # Whats the default version
export ANSIBLE_DEFAULT_VERSION="v2.8" export ANSIBLE_DEFAULT_VERSION="v2.9"
## Create a temp dir to download avm ## Create a temp dir to download avm
avm_dir="$(mktemp -d 2> /dev/null || mktemp -d -t 'mytmpdir')" avm_dir="$(mktemp -d 2> /dev/null || mktemp -d -t 'mytmpdir')"

2
.ci/before_script.sh
View File

@ -11,7 +11,7 @@ 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.8/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1 ~/.avm/v2.9/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1
} }

2
.ci/script.sh
View File

@ -8,7 +8,7 @@ function run_kitchen_tests {
python3 --version python3 --version
pip3 --version pip3 --version
bundler --version bundler --version
bundle show bundle list
bundle exec kitchen test --test-base-path="$PWD/.ci/integration" $KITCHEN_REGEXP bundle exec kitchen test --test-base-path="$PWD/.ci/integration" $KITCHEN_REGEXP
} }

2
.kitchen.yml
View File

@ -11,7 +11,7 @@ provisioner:
ansible_verbose: false ansible_verbose: false
require_ansible_repo: false require_ansible_repo: false
require_ansible_omnibus: true require_ansible_omnibus: true
ansible_version: 2.8.4 ansible_version: 2.9.2
require_chef_for_busser: false require_chef_for_busser: false
sudo_command: sudo -E -H sudo_command: sudo -E -H
idempotency_test: false idempotency_test: false

24
.travis.yml
View File

@ -20,12 +20,12 @@ matrix:
language: shell language: shell
#language: ruby #language: ruby
#rvm: 2.6 #rvm: 2.6
- os: linux #- os: linux
env: KITCHEN_REGEXP="gnupg1-alpine-latest"; SECRETS_TEST_VERBOSE=1 # env: KITCHEN_REGEXP="gnupg1-alpine-latest"; SECRETS_TEST_VERBOSE=1
services: docker # services: docker
sudo: required # sudo: required
language: ruby # language: ruby
rvm: 2.6 # rvm: 2.6
- os: linux - os: linux
env: KITCHEN_REGEXP="gnupg1-debian-latest" env: KITCHEN_REGEXP="gnupg1-debian-latest"
services: docker services: docker
@ -50,12 +50,12 @@ matrix:
sudo: required sudo: required
language: ruby language: ruby
rvm: 2.6 rvm: 2.6
- os: linux #- os: linux
env: KITCHEN_REGEXP="gnupg2-alpine-latest" # env: KITCHEN_REGEXP="gnupg2-alpine-latest"
services: docker # services: docker
sudo: required # sudo: required
language: ruby # language: ruby
rvm: 2.6 # rvm: 2.6
# distribute deb on this successful test # distribute deb on this successful test
- os: linux - os: linux
env: KITCHEN_REGEXP="gnupg2-debian-latest"; GITSECRET_DIST="deb" env: KITCHEN_REGEXP="gnupg2-debian-latest"; GITSECRET_DIST="deb"

7
CHANGELOG.md
View File

@ -1,5 +1,12 @@
# Changelog # Changelog
## {Next Version}
### Misc
- Reflect changes in ruby bundler during build process
- Upgrade build process to ansible 2.9
## Version 0.3.2 ## Version 0.3.2
### Bugfixes ### Bugfixes