Improve option to skip CI

- KISS makefile
- log function for dump script
This commit is contained in:
Faustin Lammler 2020-05-27 17:35:25 +02:00
parent 7b289de42f
commit 9c5628ac13
No known key found for this signature in database
GPG Key ID: 390A2F27832A5C79
3 changed files with 12 additions and 11 deletions

View File

@ -15,24 +15,21 @@ cache:
directories: directories:
- $HOME/.cache/pre-commit - $HOME/.cache/pre-commit
install:
- pip3 install -r requirements.txt
jobs: jobs:
include: include:
- name: lint with pre-commit - name: lint with pre-commit
install: skip
script: script:
- pip3 install pre-commit - pip3 install pre-commit
- pre-commit run -c .travis-pre-commit-config.yaml -a - pre-commit run -c .travis-pre-commit-config.yaml -a
script: 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 then
echo "Only doc files were updated, not running the CI." echo "Only doc files were updated, not running the CI."
exit exit
fi fi
- pip3 install -r requirements.txt
- export ANSIBLE_STRATEGY=mitogen_linear - export ANSIBLE_STRATEGY=mitogen_linear
- export ANSIBLE_STRATEGY_PLUGINS=${VIRTUAL_ENV}/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ansible_mitogen/plugins/strategy - export ANSIBLE_STRATEGY_PLUGINS=${VIRTUAL_ENV}/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ansible_mitogen/plugins/strategy
- molecule --version - molecule --version

View File

@ -1,8 +1,8 @@
venv: venv:
pip3 install -r requirements.txt pip3 install -r requirements.txt
venv_upgrade: venv-upgrade:
for i in $$(cat requirements.txt|cut -d "=" -f1); do pip3 install $$i -U; done pip3 install -U -r requirements.txt
test: test:
molecule test molecule test

View File

@ -9,6 +9,10 @@ err() {
echo >&2 "[$(date +'%Y-%m-%dT%H:%M:%S%z')] ERROR: $*" echo >&2 "[$(date +'%Y-%m-%dT%H:%M:%S%z')] ERROR: $*"
} }
echo_date() {
echo -e "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*"
}
usage() { usage() {
cat >&2 <<-EOF cat >&2 <<-EOF
Usage : $0 -d <directory> -l <db_name> Usage : $0 -d <directory> -l <db_name>
@ -72,7 +76,7 @@ for cmd in mysqldump gzip; do
done done
for db in ${VAR_DB_LIST_ARGS//,/ }; do 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 typeset DUMP_FILE=$VAR_DUMPS_DST_DIR/$db.$(date +%F_%H%M%S).sql
mysqldump --single-transaction --quick --routines "$db" >"$DUMP_FILE" mysqldump --single-transaction --quick --routines "$db" >"$DUMP_FILE"
# shellcheck disable=SC2181 # shellcheck disable=SC2181
@ -80,16 +84,16 @@ for db in ${VAR_DB_LIST_ARGS//,/ }; do
err "unable do dump $db" err "unable do dump $db"
exit 1 exit 1
fi fi
echo -e "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: done.\n" echo_date "done.\n"
done done
for sql in "$VAR_DUMPS_DST_DIR/"*.sql; do 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" || { gzip -- "$sql" || {
err "gzip $sql" err "gzip $sql"
exit 1 exit 1
} }
echo -e "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: done.\n" echo_date "done.\n"
done done
if [[ -n $VAR_ROTATION_DAYS_ARGS ]]; then if [[ -n $VAR_ROTATION_DAYS_ARGS ]]; then