1
0
Fork 0

CI - Fix change detection (#7038)

* Fix travis change detection

* Fix travis change detection - add back python ignore
This commit is contained in:
Joel Challis 2019-11-05 00:18:57 +00:00 committed by Drashna Jaelre
parent efa28d0f5c
commit d382eeeb9d
7 changed files with 64 additions and 74 deletions

View file

@ -16,6 +16,7 @@ install:
- npm install -g moxygen - npm install -g moxygen
script: script:
- git rev-parse --short HEAD - git rev-parse --short HEAD
- git diff --name-only HEAD $TRAVIS_BRANCH
- 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 - bash util/travis_docs.sh

View file

@ -1,57 +1,42 @@
#!/bin/bash #!/bin/bash
# if docker is installed - patch calls to within the qmk docker image source util/travis_utils.sh
if command -v docker >/dev/null; then
function make() { NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
} if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then
echo "Skipping due to commit message"
exit 0
fi fi
# test force push if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then
#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
MAKE_ALL="make all:default"
if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
exit_code=0
git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
if [ $? -eq 128 ]; then
# We don't know what changed so just build the default keymaps
echo "Making default keymaps for all keyboards (fallback)"
eval $MAKE_ALL
: $((exit_code = $exit_code + $?))
else
NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(lib/python/)' | grep -Ev '^(bin/qmk)' | grep -Ev '^(requirements.txt)' | grep -Ev '^(util/)' | 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" echo "Making default keymaps for all keyboards"
eval $MAKE_ALL make all:default
: $((exit_code = $exit_code + $?)) exit $?
else fi
# keyboards project format
# /keyboards/board1/rev/keymaps/ exit_code=0
# /keyboards/board2/keymaps/
# ensure we strip everything off after and including the keymaps folder to get board and/or revision for KB in $(make list-keyboards); do
MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sed 's^/keymaps/.*^^' | sort -u) KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
for KB in $MKB ; do if [[ -z "$KEYBOARD_CHANGES" ]]; then
KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l) # skip as no changes for this keyboard
continue
fi
KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/)
if [[ $KEYMAP_ONLY -gt 0 ]]; then if [[ $KEYMAP_ONLY -gt 0 ]]; then
echo "Making all keymaps for $KB" echo "Making all keymaps for $KB"
make ${KB}:all make ${KB}:all
: $((exit_code = $exit_code + $?)) : $((exit_code = $exit_code + $?))
else else
MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) CHANGED_KEYMAPS=$(echo "$KEYBOARD_CHANGES" | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_-]+)(?=\/)')
for KM in $MKM ; do for KM in $CHANGED_KEYMAPS ; do
echo "Making $KM for $KB" echo "Making $KM for $KB"
make ${KB}:${KM} make ${KB}:${KM}
: $((exit_code = $exit_code + $?)) : $((exit_code = $exit_code + $?))
done done
fi fi
done done
fi
fi
exit $exit_code exit $exit_code
fi

View file

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
source util/travis_utils.sh
source util/travis_push.sh source util/travis_push.sh
set -o errexit -o nounset set -o errexit -o nounset

View file

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
source util/travis_utils.sh
source util/travis_push.sh source util/travis_push.sh
if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip docs]"* ]] ; then if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip docs]"* ]] ; then

View file

@ -1,10 +1,5 @@
# Use this by sourcing it in your script. # Use this by sourcing it in your script.
TRAVIS_BRANCH="${TRAVIS_BRANCH:master}"
TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}"
TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
git config --global user.name "QMK Bot" git config --global user.name "QMK Bot"
git config --global user.email "hello@qmk.fm" git config --global user.email "hello@qmk.fm"

View file

@ -1,26 +1,9 @@
#!/bin/bash #!/bin/bash
# if docker is installed - patch calls to within the qmk docker image source util/travis_utils.sh
if command -v docker >/dev/null; then
function make() {
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
}
function qmk() {
docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk "$@"
}
fi
TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" NUM_PY_CHANGES=$(echo "$QMK_CHANGES" | grep -Ec -e '^(lib/python/)' -e '^(bin/qmk)')
# test force push
#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
BRANCH=$(git rev-parse --abbrev-ref HEAD)
CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE})
NUM_CORE_CHANGES=$(echo "$CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)')
NUM_PY_CHANGES=$(echo "$CHANGES" | grep -Ec -e '^(lib/python/)' -e '^(bin/qmk)')
if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then
echo "Skipping due to commit message" echo "Skipping due to commit message"
@ -29,14 +12,14 @@ fi
exit_code=0 exit_code=0
if [ "$BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then
echo "Running tests." echo "Running tests."
make test:all make test:all
: $((exit_code = $exit_code + $?)) : $((exit_code = $exit_code + $?))
fi fi
if [ "$BRANCH" == "master" ] || [ "$NUM_PY_CHANGES" != "0" ]; then if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_PY_CHANGES" != "0" ]; then
echo "Running python tests." echo "Running python tests."
qmk pytest qmk pytest
: $((exit_code = $exit_code + $?)) : $((exit_code = $exit_code + $?))

24
util/travis_utils.sh Executable file
View file

@ -0,0 +1,24 @@
# Use this by sourcing it in your script.
# Provide sane defaults for travis environment
TRAVIS_BRANCH="${TRAVIS_BRANCH:master}"
TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}"
TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
# test force push
#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
# Extra variables
LOCAL_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}
QMK_CHANGES=$(git diff --name-only HEAD ${TRAVIS_BRANCH})
# if docker is installed - patch calls to within the qmk docker image
if command -v docker >/dev/null; then
function make() {
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
}
function qmk() {
docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk "$@"
}
fi