Skip to content
Permalink
Browse files

Disable clang-format, clean up scripts

  • Loading branch information
rubenwardy authored and sfan5 committed Mar 1, 2021
1 parent b390bd2 commit ccdaf5de54108990fcdeb0b0ff4a4fc4cd998522
Showing with 42 additions and 15 deletions.
  1. +14 −13 .github/workflows/cpp_lint.yml
  2. +23 −2 util/ci/{lint.sh → clang-format.sh}
  3. +5 −0 util/fix_format.sh
@@ -24,20 +24,21 @@ on:
- '.github/workflows/**.yml'

jobs:
clang_format:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Install clang-format
run: |
sudo apt-get install clang-format-9 -qyy

- name: Run clang-format
run: |
source ./util/ci/lint.sh
perform_lint
env:
CLANG_FORMAT: clang-format-9
# clang_format:
# runs-on: ubuntu-18.04
# steps:
# - uses: actions/checkout@v2
# - name: Install clang-format
# run: |
# sudo apt-get install clang-format-9 -qyy
#
# - name: Run clang-format
# run: |
# source ./util/ci/clang-format.sh
# check_format
# env:
# CLANG_FORMAT: clang-format-9

clang_tidy:
runs-on: ubuntu-18.04
@@ -1,13 +1,19 @@
#! /bin/bash
function perform_lint() {
echo "Performing LINT..."

function setup_for_format() {
if [ -z "${CLANG_FORMAT}" ]; then
CLANG_FORMAT=clang-format
fi
echo "LINT: Using binary $CLANG_FORMAT"
CLANG_FORMAT_WHITELIST="util/ci/clang-format-whitelist.txt"

files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
}

function check_format() {
echo "Checking format..."

setup_for_format

local errorcount=0
local fail=0
@@ -41,3 +47,18 @@ function perform_lint() {
echo "LINT OK"
}



function fix_format() {
echo "Fixing format..."

setup_for_format

for f in ${files_to_lint}; do
whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
if [ -z "${whitelisted}" ]; then
echo "$f"
$CLANG_FORMAT -i "$f"
fi
done
}
@@ -0,0 +1,5 @@
#!/bin/bash -e

. ./util/ci/clang-format.sh

fix_format

0 comments on commit ccdaf5d

Please sign in to comment.