Merge remote-tracking branch 'origin/master' into develop

5 files changed, 0 insertions, 161 deletions

diff --git a/util/travis_build.sh b/util/travis_build.sh
deleted file mode 100755
index a96cfcb575..0000000000
--- a/util/travis_build.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-source util/travis_utils.sh
-
-if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then
-    echo "Skipping due to commit message"
-    exit 0
-fi
-
-if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then
-    echo "Making default keymaps for all keyboards"
-    make all:default
-    exit $?
-fi
-
-exit_code=0
-
-for KB in $(make list-keyboards); do
-	KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
-	if [[ -z "$KEYBOARD_CHANGES" ]]; then
-		# skip as no changes for this keyboard
-		continue
-	fi
-
-	KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/)
-	if [[ $KEYMAP_ONLY -gt 0 ]]; then
-		echo "Making all keymaps for $KB"
-		make ${KB}:all
-		: $((exit_code = $exit_code + $?))
-	else
-		CHANGED_KEYMAPS=$(echo "$KEYBOARD_CHANGES" | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_-]+)(?=\/)')
-		for KM in $CHANGED_KEYMAPS ; do
-			echo "Making $KM for $KB"
-			make ${KB}:${KM}
-			: $((exit_code = $exit_code + $?))
-		done
-	fi
-done
-
-exit $exit_code
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
deleted file mode 100755
index 73a9e3bc48..0000000000
--- a/util/travis_compiled_push.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-source util/travis_utils.sh
-source util/travis_push.sh
-
-set -o errexit -o nounset
-
-rev=$(git rev-parse --short HEAD)
-echo "Using git hash ${rev}"
-
-if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
-
-git checkout master
-
-git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
-
-if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
-	make generate-keyboards-file SILENT=true > .keyboards
-	cd ..
-	git clone git@github.com:qmk/qmk.fm.git
-	cd qmk.fm
-	mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
-	mv ../qmk_firmware/.keyboards .
-	ssh-add -D
-	eval `ssh-agent -s`
-	ssh-add id_rsa_qmk.fm
-
-	# don't delete files in case not all keyboards are built
-	# rm -f compiled/*.hex
-
-	# ignore errors here
-	# In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names
-	mv ../qmk_firmware/*_default.*{hex,bin} ./compiled/ || true
-
-	# get the list of keyboards
-	readarray -t keyboards < .keyboards
-
-	# replace / with _
-	keyboards=("${keyboards[@]//[\/]/_}")
-
-	# remove all binaries that don't belong to a keyboard in .keyboards
-	for file in "./compiled"/* ; do
-		match=0
-		for keyboard in "${keyboards[@]}" ; do
-			if [[ ${file##*/} = "${keyboard}_default.bin" ]] || [[ ${file##*/} = "${keyboard}_default.hex" ]]; then
-				match=1
-				break
-			fi
-		done
-		if [[ $match = 0 ]]; then
-			echo "Removing deprecated binary: $file"
-			rm "$file"
-		fi
-	done
-
-	bash _util/generate_keyboard_page.sh
-	git add -A
-	git commit -m "generated from qmk/qmk_firmware@${rev}"
-	git push git@github.com:qmk/qmk.fm.git
-
-fi
-
-fi
diff --git a/util/travis_push.sh b/util/travis_push.sh
deleted file mode 100755
index 7f7d4c2c64..0000000000
--- a/util/travis_push.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Use this by sourcing it in your script.
-
-if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
-	git config --global user.name "QMK Bot"
-	git config --global user.email "hello@qmk.fm"
-
-	openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
-	tar xvf secrets.tar
-
-	chmod 600 id_rsa_qmk_firmware
-	chmod 600 id_rsa_qmk.fm
-	eval `ssh-agent -s`
-	ssh-add id_rsa_qmk_firmware
-fi
diff --git a/util/travis_test.sh b/util/travis_test.sh
deleted file mode 100644
index 9156147ca6..0000000000
--- a/util/travis_test.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-source util/travis_utils.sh
-
-if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then
-    echo "Skipping due to commit message"
-    exit 0
-fi
-
-exit_code=0
-
-if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then
-    echo "Running tests."
-    make test:all
-    : $((exit_code = $exit_code + $?))
-
-fi
-
-exit $exit_code
diff --git a/util/travis_utils.sh b/util/travis_utils.sh
deleted file mode 100755
index e949946e22..0000000000
--- a/util/travis_utils.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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=$(git rev-parse --abbrev-ref HEAD)
-QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE})
-NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ec -e '^Makefile' -e '^[^/]*.mk' -e '^drivers/' -e '^lib/atsam' -e '^lib/lib8tion/' -e '^platforms' -e '^quantum' -e '^tests' -e '^tmk_core')
-
-# 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