Add "ymlfmt" for enforcing consistent YAML whitespace
This commit is contained in:
parent
14c4a7cfee
commit
9efeec18b6
|
|
@ -1,12 +1,13 @@
|
||||||
language: go
|
language: bash
|
||||||
|
services: docker
|
||||||
sudo: false
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- .travis/get-markdownfmt.sh
|
- docker pull tianon/markdownfmt
|
||||||
|
- docker pull tianon/ymlfmt
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- .travis/check-markdownfmt.sh
|
- .travis/check-markdownfmt.sh
|
||||||
|
- .travis/check-ymlfmt.sh
|
||||||
- .travis/check-short.sh
|
- .travis/check-short.sh
|
||||||
- .travis/check-required-files.sh
|
- .travis/check-required-files.sh
|
||||||
- .travis/check-pr-no-readme.sh
|
- .travis/check-pr-no-readme.sh
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,11 @@ files="$(
|
||||||
-name '*.md' \
|
-name '*.md' \
|
||||||
-not -name 'README.md' \
|
-not -name 'README.md' \
|
||||||
\) -exec test -s '{}' ';' -print0 \
|
\) -exec test -s '{}' ';' -print0 \
|
||||||
| xargs -0 markdownfmt -l)"
|
| xargs -0 ./markdownfmt.sh -l)"
|
||||||
if [ "$files" ]; then
|
if [ "$files" ]; then
|
||||||
echo >&2 'Need markdownfmt:'
|
echo >&2 'Need markdownfmt:'
|
||||||
echo >&2 "$files"
|
echo >&2 "$files"
|
||||||
echo >&2
|
echo >&2
|
||||||
echo "$files" | xargs markdownfmt -d >&2
|
echo "$files" | xargs ./markdownfmt.sh -d >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
|
||||||
|
|
||||||
|
files="$(find -name '*.yml')"
|
||||||
|
need=()
|
||||||
|
needdiff=
|
||||||
|
for f in $files; do
|
||||||
|
fdiff="$(./ymlfmt.sh -d "$f")"
|
||||||
|
if [ -n "$fdiff" ]; then
|
||||||
|
need+=( "$f" )
|
||||||
|
needdiff+="$fdiff"$'\n'
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ -n "$needdiff" ]; then
|
||||||
|
echo >&2 'Need ymlfmt:'
|
||||||
|
echo >&2 "${need[@]}"
|
||||||
|
echo >&2
|
||||||
|
echo >&2 -n "$needdiff"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
exec docker run -i --rm -v "$PWD":/scratch -w /scratch tianon/markdownfmt markdownfmt "$@"
|
exec docker run -i --rm -v "$PWD":/scratch -w /scratch -u "$(id -u):$(id -g)" tianon/markdownfmt markdownfmt "$@"
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
# @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php
|
# @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php
|
||||||
MYSQL_DATABASE: 'my_wiki'
|
MYSQL_DATABASE: my_wiki
|
||||||
MYSQL_USER: 'wikiuser'
|
MYSQL_USER: wikiuser
|
||||||
MYSQL_PASSWORD: 'example'
|
MYSQL_PASSWORD: example
|
||||||
MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
|
MYSQL_RANDOM_ROOT_PASSWORD: yes
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue