jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up scripts for ZSA repo

Browse Source
This commit is contained in:
Drashna Jaelre
2019-05-31 15:07:52 -07:00
committed by Florian Didron
parent 3a96a585e1
commit 524e2b9487
2 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -21,7 +21,6 @@ script:
- git rev-parse --short HEAD - git rev-parse --short HEAD
- bash util/travis_test.sh - bash util/travis_test.sh
- bash util/travis_build.sh - bash util/travis_build.sh
- bash util/travis_docs.sh
addons: addons:
apt: apt:
packages: packages:

37
util/travis_build.sh
View File

@@ -12,45 +12,12 @@ fi
TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" 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 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
exit_code=0 exit_code=0
git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} echo "Making all keymaps for all of the ZSA keyboards"
if [ $? -eq 128 ]; then
echo "Making default keymaps for all keyboards"
eval $MAKE_ALL eval $MAKE_ALL
: $((exit_code = $exit_code + $?)) : $((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
exit $exit_code exit $exit_code
fi fi