From ed949e20cbc219c63f43e2774d49d0e06a3c2f09 Mon Sep 17 00:00:00 2001 From: Michael Suo Date: Thu, 27 Dec 2018 10:53:58 -0800 Subject: [PATCH] Revert D13552080: [pytorch][PR] add clang-format check to CI Differential Revision: D13552080 Original commit changeset: 462a73894c16 fbshipit-source-id: ebfc5aa3343cebabbc24ff39e4e9841a372443e2 --- .travis.yml | 10 +--------- tools/run-clang-format-in-ci.sh | 21 --------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100755 tools/run-clang-format-in-ci.sh diff --git a/.travis.yml b/.travis.yml index a010db5..ab07565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,12 +41,4 @@ matrix: - llvm-toolchain-trusty packages: clang-tidy script: tools/run-clang-tidy-in-ci.sh - - env: CLANG_FORMAT - python: "3.6" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty - packages: clang-format - script: tools/run-clang-format-in-ci.sh + diff --git a/tools/run-clang-format-in-ci.sh b/tools/run-clang-format-in-ci.sh deleted file mode 100755 index 5b1fef1..0000000 --- a/tools/run-clang-format-in-ci.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e - -# Run clang-format on whitelisted files and return non-zero if it -# introduced a diff - -DIFF_AGAINST=HEAD -# From https://docs.travis-ci.com/user/environment-variables -if [[ $TRAVIS ]]; then - git remote add upstream https://github.com/pytorch/pytorch - git fetch upstream "$TRAVIS_BRANCH" - DIFF_AGAINST="upstream/$TRAVIS_BRANCH" -fi - -CLANG_FORMAT_DIFF=$(python tools/clang_format.py --diff "$DIFF_AGAINST") -if [[ ${CLANG_FORMAT_DIFF} ]] -then - echo "${CLANG_FORMAT_DIFF}" - exit 1 -fi - -- 2.7.4