Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 files changed, 79 insertions, 10 deletions

diff --git a/util/linux_install.sh b/util/linux_install.sh
index 5e2afe999..4731ec015 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -2,10 +2,12 @@
 
 # Note: This file uses tabs to indent. Please don't mix tabs and spaces.
 
-GENTOO_WARNING="This script will make a USE change in order to ensure that that QMK works on your system. All changes will be sent to the the file /etc/portage/package.use/qmk_firmware -- please review it, and read Portage's output carefully before installing any packages on your system. You will also need to ensure that your kernel is compiled with support for the keyboard chip that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki."
+GENTOO_WARNING="This script will make a USE change in order to ensure that that QMK works on your system. All changes will be sent to the the file /etc/portage/package.use/qmkfirmware -- please review it, and read Portage's output carefully before installing any packages on your system. You will also need to ensure that your kernel is compiled with support for the keyboard chip that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki."
 
 SLACKWARE_WARNING="You will need the following packages from slackbuilds.org:\n\tarm-binutils\n\tarm-gcc\n\tavr-binutils\n\tavr-gcc\n\tavr-libc\n\tavrdude\n\tdfu-programmer\n\tdfu-util\n\tnewlib\nThese packages will be installed with sudo and sboinstall, so ensure that your user is added to sudoers and that sboinstall is configured."
 
+SOLUS_INFO="Your tools are now installed. To start using them, open new terminal or source these scripts:\n\t/usr/share/defaults/etc/profile.d/50-arm-toolchain-path.sh\n\t/usr/share/defaults/etc/profile.d/50-avr-toolchain-path.sh"
+
 if grep ID /etc/os-release | grep -qE "fedora"; then
 	sudo dnf install \
 		arm-none-eabi-binutils-cs \
@@ -54,12 +56,12 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
 		zip
 
 elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
-	# install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug.
-	sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz
+	sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz
 	sudo pacman -S \
 		arm-none-eabi-binutils \
 		arm-none-eabi-gcc \
 		arm-none-eabi-newlib \
+		avrdude \
 		avr-binutils \
 		avr-libc \
 		avr-gcc \
@@ -116,7 +118,7 @@ elif grep ID /etc/os-release | grep -q sabayon; then
 elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then
 	CROSS_AVR_GCC=cross-avr-gcc8
 	CROSS_ARM_GCC=cross-arm-none-gcc8
-	if grep ID /etc/os-release | grep -q "15.0"; then
+	if grep ID /etc/os-release | grep -q "15."; then
 		CROSS_AVR_GCC=cross-avr-gcc7
 		CROSS_ARM_GCC=cross-arm-none-gcc7
 	fi
@@ -156,6 +158,26 @@ elif grep ID /etc/os-release | grep -q slackware; then
 		echo "Quitting..."
 	fi
 
+elif grep ID /etc/os-release | grep -q solus; then
+	sudo eopkg ur
+	sudo eopkg it \
+		-c system.devel \
+		arm-none-eabi-gcc \
+		arm-none-eabi-binutils \
+		arm-none-eabi-newlib \
+		avr-libc \
+		avr-binutils \
+		avr-gcc \
+		avrdude \
+		dfu-util \
+		dfu-programmer \
+		python3 \
+		git \
+		wget \
+		zip \
+		unzip
+	printf "\n$SOLUS_INFO\n"
+
 else
 	echo "Sorry, we don't recognize your OS. Help us by contributing support!"
 	echo
diff --git a/util/macos_install.sh b/util/macos_install.sh
index 93f3ed0b9..915ff3143 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -22,5 +22,5 @@ fi
 brew tap osx-cross/avr
 brew tap PX4/homebrew-px4
 brew update
-brew install avr-gcc@7 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
-brew link --force avr-gcc@7
+brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
+brew link --force avr-gcc@8
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh
index e9ce30978..35d89e402 100755
--- a/util/new_keyboard.sh
+++ b/util/new_keyboard.sh
@@ -70,6 +70,18 @@ replace_placeholders() {
     echo " done"
 }
 
+# Replace %YEAR% with the current year.
+replace_year_placeholders() {
+    local replace_year_filenames=(
+        "${keyboard_dir}/config.h"
+        "${keyboard_dir}/${keyboard_name}.c"
+        "${keyboard_dir}/${keyboard_name}.h"
+        "${keyboard_dir}/keymaps/default/config.h"
+        "${keyboard_dir}/keymaps/default/keymap.c"
+    )
+    replace_placeholders "%YEAR%" "$(date +%Y)" "${replace_year_filenames[@]}"
+}
+
 # Replace %KEYBOARD% with the keyboard name.
 replace_keyboard_placeholders() {
     local replace_keyboard_filenames=(
@@ -149,6 +161,7 @@ echo
 
 copy_templates
 set_sed_i
+replace_year_placeholders
 replace_keyboard_placeholders
 [ -n "$username" ] && replace_name_placeholders
 
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 2c6c62931..554ec8b68 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# if docker is installed - call make 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/qmk_firmware make "$@"
+  }
+fi
+
 # test force push
 #TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
 
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index d76030f83..04021ae7c 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -29,8 +29,7 @@ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/
 if [[ $NEFM -gt 0 ]] ; then
 	echo "Essential files modified."
 	git fetch --tags
-	#lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
-	lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | tail -1)
+	lasttag=$(git tag --sort=-creatordate --no-column --list '*.*.*' | grep -E -m1 '^[0-9]+\.[0-9]+\.[0-9]+$')
 	newtag=$(increment_version $lasttag)
 	until git tag $newtag; do
 		newtag=$(increment_version $newtag)
@@ -55,8 +54,29 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	# 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.*[hb][ei][xn] ./compiled/ || true
+	# 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
diff --git a/util/travis_test.sh b/util/travis_test.sh
index 6c48f898c..3be4afff7 100644
--- a/util/travis_test.sh
+++ b/util/travis_test.sh
@@ -19,4 +19,11 @@ if [ "$BRANCH" != "master" ] && [ "$NUM_IMPACTING_CHANGES" == "0" ]; then
     exit 0
 fi
 
+# if docker is installed - call make 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/qmk_firmware make "$@"
+  }
+fi
+
 make test:all