Skip to content

Commit

Permalink
Disable cmake-format
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Feb 17, 2022
1 parent 7fe259e commit 15715ba
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/cmake-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install cmake-format pyyaml
- name: Check cmakelist
run: find . -name CMakeLists.txt |xargs cmake-format --check
# Disabled because of https://github.com/OSGeo/gdal/pull/5326#issuecomment-1042617407
#- name: Check cmakelist
# run: find . -name CMakeLists.txt |xargs cmake-format --check
11 changes: 6 additions & 5 deletions scripts/reformat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ for f in $MODIFIED; do
;;
esac

m=$f.prepare
cp "$f" "$m"
cmake-format -i "$f"
diff -u "$m" "$f" >> "$FORMAT_FIX_DIFF" || /bin/true
rm -f "$m"
# Disable cmake-format (https://github.com/OSGeo/gdal/pull/5326#issuecomment-1042617407)
# m=$f.prepare
# cp "$f" "$m"
# cmake-format -i "$f"
# diff -u "$m" "$f" >> "$FORMAT_FIX_DIFF" || /bin/true
# rm -f "$m"
done

ret_code=0
Expand Down

0 comments on commit 15715ba

Please sign in to comment.