diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-05-31 15:07:52 -0700 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-06-04 17:59:59 +0900 |
| commit | 524e2b948743e9f17d203b7741d3e09bcb5e8bd9 (patch) | |
| tree | 695243f74eed7c7ff911f4091d5db042f6c7552f | |
| parent | 3a96a585e190f4c51919df85f1fbae3983b30ef7 (diff) | |
Fix up scripts for ZSA repo
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | util/travis_build.sh | 41 |
2 files changed, 4 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index a4aec2db15..841e44dd45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ script: - git rev-parse --short HEAD - bash util/travis_test.sh - bash util/travis_build.sh - - bash util/travis_docs.sh addons: apt: packages: diff --git a/util/travis_build.sh b/util/travis_build.sh index 554ec8b689..ed80d52f56 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -12,45 +12,12 @@ fi TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" -MAKE_ALL="make all:default" +MAKE_ALL="make all:all" if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then exit_code=0 - git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} - if [ $? -eq 128 ]; then - echo "Making default keymaps for all keyboards" - eval $MAKE_ALL - : $((exit_code = $exit_code + $?)) - else - NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) - BRANCH=$(git rev-parse --abbrev-ref HEAD) - # is this branch master or a "non docs, non keyboards" change - if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then - echo "Making default keymaps for all keyboards" - eval $MAKE_ALL - : $((exit_code = $exit_code + $?)) - else - # keyboards project format - # /keyboards/board1/rev/keymaps/ - # /keyboards/board2/keymaps/ - # ensure we strip everything off after and including the keymaps folder to get board and/or revision - MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sed 's^/keymaps/.*^^' | sort -u) - for KB in $MKB ; do - KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l) - if [[ $KEYMAP_ONLY -gt 0 ]]; then - echo "Making all keymaps for $KB" - make ${KB}:all - : $((exit_code = $exit_code + $?)) - else - MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) - for KM in $MKM ; do - echo "Making $KM for $KB" - make ${KB}:${KM} - : $((exit_code = $exit_code + $?)) - done - fi - done - fi - fi + echo "Making all keymaps for all of the ZSA keyboards" + eval $MAKE_ALL + : $((exit_code = $exit_code + $?)) exit $exit_code fi |