aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2020-03-04 01:20:39 +0100
committercbdev <cb@cbcdn.com>2020-03-04 01:20:39 +0100
commit2e689e8852dc985249b214a9db98c1221dfc689f (patch)
tree6542bca55c4ecb8813129f343f7de2fce2aab730
parentfe84e353f2580315804319438b1951752249a9ee (diff)
downloadmidimonster-2e689e8852dc985249b214a9db98c1221dfc689f.tar.gz
midimonster-2e689e8852dc985249b214a9db98c1221dfc689f.tar.bz2
midimonster-2e689e8852dc985249b214a9db98c1221dfc689f.zip
Clean up & retab CI script, fix typo
-rw-r--r--.travis-ci.sh182
-rw-r--r--backends/python.md2
2 files changed, 86 insertions, 98 deletions
diff --git a/.travis-ci.sh b/.travis-ci.sh
index c278b33..8008026 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -5,111 +5,99 @@
set -e
-COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh"
-
SPELLINGBLACKLIST=$(cat <<-BLACKLIST
- -wholename "./.git/*"
+-wholename "./.git/*"
BLACKLIST
)
if [[ $TASK = 'spellintian' ]]; then
- # run spellintian only if it is the requested task, ignoring duplicate words
- spellingfiles=$(eval "find ./ -type f -and ! \( \
- $SPELLINGBLACKLIST \
- \) | xargs")
- # count the number of spellintian errors, ignoring duplicate words
- spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | grep -v "\(duplicate word\)" | wc -l)
- if [[ $spellingerrors -ne 0 ]]; then
- # print the output for info
- zrun spellintian $spellingfiles | grep -v "\(duplicate word\)"
- echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates"
- exit 1;
- else
- echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates"
- fi;
+ # run spellintian only if it is the requested task, ignoring duplicate words
+ spellingfiles=$(eval "find ./ -type f -and ! \( \
+ $SPELLINGBLACKLIST \
+ \) | xargs")
+ # count the number of spellintian errors, ignoring duplicate words
+ spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | grep -v "\(duplicate word\)" | wc -l)
+ if [[ $spellingerrors -ne 0 ]]; then
+ # print the output for info
+ zrun spellintian $spellingfiles | grep -v "\(duplicate word\)"
+ echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates"
+ exit 1;
+ else
+ echo "Found $spellingerrors spelling errors via spellintian, ignoring duplicates"
+ fi;
elif [[ $TASK = 'spellintian-duplicates' ]]; then
- # run spellintian only if it is the requested task
- spellingfiles=$(eval "find ./ -type f -and ! \( \
- $SPELLINGBLACKLIST \
- \) | xargs")
- # count the number of spellintian errors
- spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | wc -l)
- if [[ $spellingerrors -ne 0 ]]; then
- # print the output for info
- zrun spellintian $spellingfiles
- echo "Found $spellingerrors spelling errors via spellintian"
- exit 1;
- else
- echo "Found $spellingerrors spelling errors via spellintian"
- fi;
+ # run spellintian only if it is the requested task
+ spellingfiles=$(eval "find ./ -type f -and ! \( \
+ $SPELLINGBLACKLIST \
+ \) | xargs")
+ # count the number of spellintian errors
+ spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | wc -l)
+ if [[ $spellingerrors -ne 0 ]]; then
+ # print the output for info
+ zrun spellintian $spellingfiles
+ echo "Found $spellingerrors spelling errors via spellintian"
+ exit 1;
+ else
+ echo "Found $spellingerrors spelling errors via spellintian"
+ fi;
elif [[ $TASK = 'codespell' ]]; then
- # run codespell only if it is the requested task
- spellingfiles=$(eval "find ./ -type f -and ! \( \
- $SPELLINGBLACKLIST \
- \) | xargs")
- # count the number of codespell errors
- spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" $spellingfiles 2>&1 | wc -l)
- if [[ $spellingerrors -ne 0 ]]; then
- # print the output for info
- zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" $spellingfiles
- echo "Found $spellingerrors spelling errors via codespell"
- exit 1;
- else
- echo "Found $spellingerrors spelling errors via codespell"
- fi;
-elif [[ $TASK = 'coverity' ]]; then
- # Run Coverity Scan unless token is zero length
- # The Coverity Scan script also relies on a number of other COVERITY_SCAN_
- # variables set in .travis.yml
- if [[ ${#COVERITY_SCAN_TOKEN} -ne 0 ]]; then
- curl -s $COVERITY_SCAN_BUILD_URL | bash
- else
- echo "Skipping Coverity Scan as no token found, probably a Pull Request"
- fi;
+ # run codespell only if it is the requested task
+ spellingfiles=$(eval "find ./ -type f -and ! \( \
+ $SPELLINGBLACKLIST \
+ \) | xargs")
+ # count the number of codespell errors
+ spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" $spellingfiles 2>&1 | wc -l)
+ if [[ $spellingerrors -ne 0 ]]; then
+ # print the output for info
+ zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" $spellingfiles
+ echo "Found $spellingerrors spelling errors via codespell"
+ exit 1;
+ else
+ echo "Found $spellingerrors spelling errors via codespell"
+ fi;
elif [[ $TASK = 'sanitize' ]]; then
- # Run sanitized compile
- travis_fold start "make_sanitize"
- make sanitize;
- travis_fold end "make_sanitize"
+ # Run sanitized compile
+ travis_fold start "make_sanitize"
+ make sanitize;
+ travis_fold end "make_sanitize"
elif [[ $TASK = 'windows' ]]; then
- # Run sanitized compile
- travis_fold start "make_windows"
- make windows;
- make -C backends lua.dll
- travis_fold end "make_windows"
- travis_fold start "deploy_windows"
- if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
- mkdir ./deployment
- mkdir ./deployment/backends
- mkdir ./deployment/docs
- cp ./midimonster.exe ./deployment/
- cp ./backends/*.dll ./deployment/backends/
- cp ./monster.cfg ./deployment/monster.cfg
- cp ./backends/*.md ./deployment/docs/
- cp -r ./configs ./deployment/
- cd ./deployment
- zip -r "./midimonster-$(git describe)-windows.zip" "./"
- find . ! -iname '*.zip' -delete
- fi
- travis_fold end "deploy_windows"
+ travis_fold start "make_windows"
+ make windows;
+ make -C backends lua.dll
+ travis_fold end "make_windows"
+ if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
+ travis_fold start "deploy_windows"
+ mkdir ./deployment
+ mkdir ./deployment/backends
+ mkdir ./deployment/docs
+ cp ./midimonster.exe ./deployment/
+ cp ./backends/*.dll ./deployment/backends/
+ cp ./monster.cfg ./deployment/monster.cfg
+ cp ./backends/*.md ./deployment/docs/
+ cp -r ./configs ./deployment/
+ cd ./deployment
+ zip -r "./midimonster-$(git describe)-windows.zip" "./"
+ find . ! -iname '*.zip' -delete
+ travis_fold end "deploy_windows"
+ fi
else
- # Otherwise compile as normal
- travis_fold start "make"
- make full;
- travis_fold end "make"
- travis_fold start "deploy_unix"
- if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
- mkdir ./deployment
- mkdir ./deployment/backends
- mkdir ./deployment/docs
- cp ./midimonster ./deployment/
- cp ./backends/*.so ./deployment/backends/
- cp ./monster.cfg ./deployment/monster.cfg
- cp ./backends/*.md ./deployment/docs/
- cp -r ./configs ./deployment/
- cd ./deployment
- tar czf "midimonster-$(git describe)-$TRAVIS_OS_NAME.tgz" *
- find . ! -iname '*.tgz' -delete
- fi
- travis_fold end "deploy_unix"
+ # Otherwise compile as normal
+ travis_fold start "make"
+ make full;
+ travis_fold end "make"
+ if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
+ travis_fold start "deploy_unix"
+ mkdir ./deployment
+ mkdir ./deployment/backends
+ mkdir ./deployment/docs
+ cp ./midimonster ./deployment/
+ cp ./backends/*.so ./deployment/backends/
+ cp ./monster.cfg ./deployment/monster.cfg
+ cp ./backends/*.md ./deployment/docs/
+ cp -r ./configs ./deployment/
+ cd ./deployment
+ tar czf "midimonster-$(git describe)-$TRAVIS_OS_NAME.tgz" *
+ find . ! -iname '*.tgz' -delete
+ travis_fold end "deploy_unix"
+ fi
fi
diff --git a/backends/python.md b/backends/python.md
index 5f81e70..fae3139 100644
--- a/backends/python.md
+++ b/backends/python.md
@@ -1,7 +1,7 @@
### The `python` backend
The `python` backend provides a flexible programming environment, allowing users
-to route, generate and manipulate channel events using the Python 3 scripting languge.
+to route, generate and manipulate channel events using the Python 3 scripting language.
Every instance has its own interpreter, which can be loaded with multiple Python modules.
These modules may contain member functions accepting a single `float` parameter, which can