diff --git a/.travis.yml b/.travis.yml index 4220fd3..a2dc0d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,24 +15,21 @@ cache: directories: - $HOME/.cache/pre-commit -install: - - pip3 install -r requirements.txt - jobs: include: - name: lint with pre-commit - install: skip script: - pip3 install pre-commit - pre-commit run -c .travis-pre-commit-config.yaml -a script: - | - if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.md)|^(LICENSE)|^(docs)' + if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.md)|(.pdf)' then echo "Only doc files were updated, not running the CI." exit fi + - pip3 install -r requirements.txt - export ANSIBLE_STRATEGY=mitogen_linear - export ANSIBLE_STRATEGY_PLUGINS=${VIRTUAL_ENV}/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ansible_mitogen/plugins/strategy - molecule --version diff --git a/Makefile b/Makefile index 6b51add..e3b4d99 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ venv: pip3 install -r requirements.txt -venv_upgrade: - for i in $$(cat requirements.txt|cut -d "=" -f1); do pip3 install $$i -U; done +venv-upgrade: + pip3 install -U -r requirements.txt test: molecule test diff --git a/files/mariadb_dump_db.sh b/files/mariadb_dump_db.sh index feb99ec..1de2d5a 100755 --- a/files/mariadb_dump_db.sh +++ b/files/mariadb_dump_db.sh @@ -9,6 +9,10 @@ err() { echo >&2 "[$(date +'%Y-%m-%dT%H:%M:%S%z')] ERROR: $*" } +echo_date() { + echo -e "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" +} + usage() { cat >&2 <<-EOF Usage : $0 -d -l @@ -72,7 +76,7 @@ for cmd in mysqldump gzip; do done for db in ${VAR_DB_LIST_ARGS//,/ }; do - echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: start $db dump." + echo_date "start $db dump." typeset DUMP_FILE=$VAR_DUMPS_DST_DIR/$db.$(date +%F_%H%M%S).sql mysqldump --single-transaction --quick --routines "$db" >"$DUMP_FILE" # shellcheck disable=SC2181 @@ -80,16 +84,16 @@ for db in ${VAR_DB_LIST_ARGS//,/ }; do err "unable do dump $db" exit 1 fi - echo -e "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: done.\n" + echo_date "done.\n" done for sql in "$VAR_DUMPS_DST_DIR/"*.sql; do - echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: compress $sql." + echo_date "compress $sql." gzip -- "$sql" || { err "gzip $sql" exit 1 } - echo -e "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: done.\n" + echo_date "done.\n" done if [[ -n $VAR_ROTATION_DAYS_ARGS ]]; then