diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-04-02 14:40:17 -0400 |
|---|---|---|
| committer | Julian Rex <julian.rex@mapbox.com> | 2019-04-02 14:40:17 -0400 |
| commit | 60aa5c2589d4e5c2a84a6a81b4e36a9e9e44d8cd (patch) | |
| tree | c62bed56b8eb11ee8fc1259b0b34b64c5bb0610f | |
| parent | 2da6cb18ebb0daed021f3b1415f9769be80c1dd9 (diff) | |
| download | qtlocation-mapboxgl-60aa5c2589d4e5c2a84a6a81b4e36a9e9e44d8cd.tar.gz | |
Test changing target branch in clang-tools.sh
| -rwxr-xr-x | scripts/clang-tools.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh index 44612b3453..8c2ccb329d 100755 --- a/scripts/clang-tools.sh +++ b/scripts/clang-tools.sh @@ -3,11 +3,11 @@ set -e set -o pipefail -CLANG_TIDY_PREFIX=${CLANG_TIDY_PREFIX:-$(scripts/mason.sh PREFIX clang-tidy VERSION 6.0.1)} +CLANG_TIDY_PREFIX=${CLANG_TIDY_PREFIX:-$(scripts/mason.sh PREFIX clang-tidy VERSION 4.0.1)} CLANG_TIDY=${CLANG_TIDY:-${CLANG_TIDY_PREFIX}/bin/clang-tidy} CLANG_APPLY=${CLANG_APPLY:-${CLANG_TIDY_PREFIX}/bin/clang-apply-replacements} -CLANG_FORMAT=${CLANG_FORMAT:-$(scripts/mason.sh PREFIX clang-format VERSION 6.0.1)/bin/clang-format} +CLANG_FORMAT=${CLANG_FORMAT:-$(scripts/mason.sh PREFIX clang-format VERSION 4.0.1)/bin/clang-format} for CLANG_FILE in "${CLANG_TIDY} ${CLANG_APPLY} ${CLANG_FORMAT}"; do command -v ${CLANG_TIDY} > /dev/null 2>&1 || { @@ -33,7 +33,7 @@ function run_clang_tidy() { } function run_clang_tidy_diff() { - OUTPUT=$(git diff origin/master --src-prefix=${CDUP} --dst-prefix=${CDUP} | \ + OUTPUT=$(git diff origin/release-liquid --src-prefix=${CDUP} --dst-prefix=${CDUP} | \ ${CLANG_TIDY_PREFIX}/share/clang-tidy-diff.py \ -clang-tidy-binary ${CLANG_TIDY} \ 2>/dev/null) @@ -45,7 +45,7 @@ function run_clang_tidy_diff() { function run_clang_format() { echo "Running clang-format on $0..." - DIFF_FILES=$(git diff origin/master --name-only *cpp) + DIFF_FILES=$(git diff origin/release-liquid --name-only *cpp) echo "${DIFF_FILES}" | xargs -I{} -P ${JOBS} bash -c 'run_clang_format' {} ${CLANG_FORMAT} -i ${CDUP}/$0 || exit 1 } |