diff --git a/.clang-format b/.clang-format deleted file mode 100644 index f0b9df629..000000000 --- a/.clang-format +++ /dev/null @@ -1,2 +0,0 @@ -BasedOnStyle: Chromium -SortIncludes: false \ No newline at end of file diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml index c16cc6bc7..e2bd4be61 100644 --- a/.github/workflows/commit-ci.yml +++ b/.github/workflows/commit-ci.yml @@ -12,12 +12,6 @@ jobs: with: submodules: true - - name: Install clang-format - run: brew install clang-format - - - name: Lint - run: make clang-format-lint - - name: Configure build environment run: | echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml index d2553dea3..43200eb2c 100644 --- a/.github/workflows/pull-request-ci.yml +++ b/.github/workflows/pull-request-ci.yml @@ -9,12 +9,6 @@ jobs: with: submodules: true - - name: Install clang-format - run: brew install clang-format - - - name: Lint - run: make clang-format-lint - - name: Configure build environment run: | echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index dc06b355f..3486eb631 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -19,12 +19,6 @@ jobs: fetch-depth: 0 submodules: true - - name: Install clang-format - run: brew install clang-format - - - name: Lint - run: make clang-format-lint - - name: Build Squirrel run: ./action-build.sh archive diff --git a/Makefile b/Makefile index 0680f4f09..1d91f2d01 100644 --- a/Makefile +++ b/Makefile @@ -84,12 +84,6 @@ copy-opencc-data: deps: librime data -clang-format-lint: - find . -name '*.m' -o -name '*.h' -maxdepth 1 | xargs clang-format -Werror --dry-run || { echo Please lint your code by '"'"make clang-format-apply"'"'.; false; } - -clang-format-apply: - find . -name '*.m' -o -name '*.h' -maxdepth 1 | xargs clang-format --verbose -i - ifdef ARCHS BUILD_SETTINGS += ARCHS="$(ARCHS)" BUILD_SETTINGS += ONLY_ACTIVE_ARCH=NO