~ruther/qmk_firmware

9e20478e6bdebc9cea49204482992471bccaf6a1 — skullydazed 6 years ago 51ee244
Enforce clang-format (#6293)

* Enforce clang-format on commit for core files

* forgot about tests
4 files changed, 10 insertions(+), 3 deletions(-)

M util/linux_install.sh
M util/macos_install.sh
M util/msys2_install.sh
M util/travis_compiled_push.sh
M util/linux_install.sh => util/linux_install.sh +6 -0
@@ 19,6 19,7 @@ if grep ID /etc/os-release | grep -qE "fedora"; then
		avr-gcc \
		avr-libc \
		binutils-avr32-linux-gnu \
		clang \
		dfu-util \
		dfu-programmer \
		diffutils \


@@ 44,6 45,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
		avr-libc \
		binutils-arm-none-eabi \
		binutils-avr \
		clang-format \
		dfu-programmer \
		dfu-util \
		diffutils \


@@ 68,6 70,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
		avr-libc \
		avr-gcc \
		base-devel \
		clang \
		dfu-util \
		diffutils \
		gcc \


@@ 96,6 99,7 @@ elif grep ID /etc/os-release | grep -q gentoo; then
			dev-embedded/avrdude \
			dev-lang/python:3.5 \
			net-misc/wget \
			sys-devel/clang \
			sys-devel/gcc \
			sys-devel/crossdev
		sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr


@@ 112,6 116,7 @@ elif grep ID /etc/os-release | grep -q sabayon; then
		dev-embedded/avrdude \
		dev-lang/python \
		net-misc/wget \
		sys-devel/clang \
		sys-devel/gcc \
		sys-devel/crossdev
	sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr


@@ 126,6 131,7 @@ elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then
	fi
	sudo zypper install \
		avr-libc \
		clang \
		$CROSS_AVR_GCC \
		$CROSS_ARM_GCC \
		cross-avr-binutils \

M util/macos_install.sh => util/macos_install.sh +1 -1
@@ 24,6 24,6 @@ fi
brew tap osx-cross/avr
brew tap PX4/homebrew-px4
brew update
brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3
brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3
brew link --force avr-gcc@8
pip3 install -r ${util_dir}/../requirements.txt

M util/msys2_install.sh => util/msys2_install.sh +1 -1
@@ 8,7 8,7 @@ installflip=false
util_dir=$(dirname "$0")

echo "Installing dependencies needed for the installation (quazip)"
pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip
pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/clang msys/git msys/p7zip msys/python3 msys/unzip

source "$dir/win_shared_install.sh"


M util/travis_compiled_push.sh => util/travis_compiled_push.sh +2 -1
@@ 9,9 9,10 @@ echo "Using git hash ${rev}"

if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then

# convert to unix line-endings
# fix formatting
git checkout master
git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | xargs -0 clang-format
git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master