aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-07-09 15:47:18 -0700
committerskullydazed <skullydazed@users.noreply.github.com>2019-08-30 15:01:52 -0700
commit9e20478e6bdebc9cea49204482992471bccaf6a1 (patch)
treed732aaed923b65cf832345e7bfdc2dfe0f8cea20
parent51ee2449060517a96cedb7c38b86a7de0be2ecab (diff)
downloadqmk_firmware-9e20478e6bdebc9cea49204482992471bccaf6a1.tar.gz
qmk_firmware-9e20478e6bdebc9cea49204482992471bccaf6a1.zip
Enforce clang-format (#6293)
* Enforce clang-format on commit for core files * forgot about tests
-rwxr-xr-xutil/linux_install.sh6
-rwxr-xr-xutil/macos_install.sh2
-rwxr-xr-xutil/msys2_install.sh2
-rwxr-xr-xutil/travis_compiled_push.sh3
4 files changed, 10 insertions, 3 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh
index d21cd3c1c..5f29cad94 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -19,6 +19,7 @@ if grep ID /etc/os-release | grep -qE "fedora"; then
19 avr-gcc \ 19 avr-gcc \
20 avr-libc \ 20 avr-libc \
21 binutils-avr32-linux-gnu \ 21 binutils-avr32-linux-gnu \
22 clang \
22 dfu-util \ 23 dfu-util \
23 dfu-programmer \ 24 dfu-programmer \
24 diffutils \ 25 diffutils \
@@ -44,6 +45,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
44 avr-libc \ 45 avr-libc \
45 binutils-arm-none-eabi \ 46 binutils-arm-none-eabi \
46 binutils-avr \ 47 binutils-avr \
48 clang-format \
47 dfu-programmer \ 49 dfu-programmer \
48 dfu-util \ 50 dfu-util \
49 diffutils \ 51 diffutils \
@@ -68,6 +70,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
68 avr-libc \ 70 avr-libc \
69 avr-gcc \ 71 avr-gcc \
70 base-devel \ 72 base-devel \
73 clang \
71 dfu-util \ 74 dfu-util \
72 diffutils \ 75 diffutils \
73 gcc \ 76 gcc \
@@ -96,6 +99,7 @@ elif grep ID /etc/os-release | grep -q gentoo; then
96 dev-embedded/avrdude \ 99 dev-embedded/avrdude \
97 dev-lang/python:3.5 \ 100 dev-lang/python:3.5 \
98 net-misc/wget \ 101 net-misc/wget \
102 sys-devel/clang \
99 sys-devel/gcc \ 103 sys-devel/gcc \
100 sys-devel/crossdev 104 sys-devel/crossdev
101 sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr 105 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
112 dev-embedded/avrdude \ 116 dev-embedded/avrdude \
113 dev-lang/python \ 117 dev-lang/python \
114 net-misc/wget \ 118 net-misc/wget \
119 sys-devel/clang \
115 sys-devel/gcc \ 120 sys-devel/gcc \
116 sys-devel/crossdev 121 sys-devel/crossdev
117 sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr 122 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
126 fi 131 fi
127 sudo zypper install \ 132 sudo zypper install \
128 avr-libc \ 133 avr-libc \
134 clang \
129 $CROSS_AVR_GCC \ 135 $CROSS_AVR_GCC \
130 $CROSS_ARM_GCC \ 136 $CROSS_ARM_GCC \
131 cross-avr-binutils \ 137 cross-avr-binutils \
diff --git a/util/macos_install.sh b/util/macos_install.sh
index f7e304424..d9ec50a7e 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -24,6 +24,6 @@ fi
24brew tap osx-cross/avr 24brew tap osx-cross/avr
25brew tap PX4/homebrew-px4 25brew tap PX4/homebrew-px4
26brew update 26brew update
27brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3 27brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude clang-format dfu-util python3
28brew link --force avr-gcc@8 28brew link --force avr-gcc@8
29pip3 install -r ${util_dir}/../requirements.txt 29pip3 install -r ${util_dir}/../requirements.txt
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index bed176da6..ac9a6c769 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -8,7 +8,7 @@ installflip=false
8util_dir=$(dirname "$0") 8util_dir=$(dirname "$0")
9 9
10echo "Installing dependencies needed for the installation (quazip)" 10echo "Installing dependencies needed for the installation (quazip)"
11pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/git msys/p7zip msys/python3 msys/unzip 11pacman --needed -S base-devel mingw-w64-x86_64-toolchain msys/clang msys/git msys/p7zip msys/python3 msys/unzip
12 12
13source "$dir/win_shared_install.sh" 13source "$dir/win_shared_install.sh"
14 14
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 04021ae7c..f20e30cdb 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -9,9 +9,10 @@ echo "Using git hash ${rev}"
9 9
10if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then 10if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
11 11
12# convert to unix line-endings 12# fix formatting
13git checkout master 13git checkout master
14git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix 14git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
15git 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
15git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add 16git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
16git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master 17git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
17 18