[DEPS] Update clang-format location
The previous location clang-format GCS location was placing content into CIPD package location (e.g. buildtools/linux64 for buildtools/linux64/format). The new location removes that conflict (e.g. places formatter into buildtools/linux64-format/ directory). Bug: 336843583 Change-Id: Ia4228941fee2fde38df8f4c4f1cccfc41f366bf4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5581721 Reviewed-by: Joanna Wang <jojwang@chromium.org> Reviewed-by: Junji Watanabe <jwata@google.com> Commit-Queue: Josip Sokcevic <sokcevic@chromium.org> Cr-Commit-Position: refs/heads/main@{#1310289}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
c56512306c
commit
cc85a77266
8
DEPS
8
DEPS
@ -648,7 +648,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'src/buildtools/win/format': {
|
'src/buildtools/win-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "win" and non_git_source',
|
'condition': 'host_os == "win" and non_git_source',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
@ -662,7 +662,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'src/buildtools/mac/format': {
|
'src/buildtools/mac-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "mac" and host_cpu == "x64" and non_git_source',
|
'condition': 'host_os == "mac" and host_cpu == "x64" and non_git_source',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
@ -676,7 +676,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'src/buildtools/mac_arm64/format': {
|
'src/buildtools/mac_arm64-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "mac" and host_cpu == "arm64" and non_git_source',
|
'condition': 'host_os == "mac" and host_cpu == "arm64" and non_git_source',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
@ -690,7 +690,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'src/buildtools/linux64/format': {
|
'src/buildtools/linux64-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "linux" and non_git_source',
|
'condition': 'host_os == "linux" and non_git_source',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
|
6
buildtools/.gitignore
vendored
6
buildtools/.gitignore
vendored
@ -3,16 +3,20 @@
|
|||||||
/android/doclava.tar.gz
|
/android/doclava.tar.gz
|
||||||
/android/doclava/
|
/android/doclava/
|
||||||
/clang_format/script/
|
/clang_format/script/
|
||||||
|
/linux-format/
|
||||||
/linux64/.versions/
|
/linux64/.versions/
|
||||||
/linux64/clang-format
|
/linux64/clang-format
|
||||||
/linux64/gn
|
/linux64/gn
|
||||||
|
/mac-format/
|
||||||
/mac/.versions/
|
/mac/.versions/
|
||||||
/mac/clang-format
|
/mac/clang-format
|
||||||
/mac/gn
|
/mac/gn
|
||||||
|
/mac_arm64-format/
|
||||||
/reclient/
|
/reclient/
|
||||||
/third_party/libc++/trunk
|
/third_party/libc++/trunk
|
||||||
/third_party/libc++abi/trunk
|
/third_party/libc++abi/trunk
|
||||||
/third_party/libunwind/trunk
|
/third_party/libunwind/trunk
|
||||||
|
/win-format/
|
||||||
/win/.versions
|
/win/.versions
|
||||||
/win/clang-format.exe
|
/win/clang-format.exe
|
||||||
/win/gn.exe
|
/win/gn.exe
|
@ -1,7 +1,13 @@
|
|||||||
use_relative_paths = True
|
use_relative_paths = True
|
||||||
|
|
||||||
|
# Only these hosts are allowed for dependencies in this DEPS file.
|
||||||
|
# If you need to add a new host, contact chrome infrastracture team.
|
||||||
|
allowed_hosts = [
|
||||||
|
'chromium-clang-format',
|
||||||
|
]
|
||||||
|
|
||||||
deps = {
|
deps = {
|
||||||
'win/format': {
|
'win-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "win"',
|
'condition': 'host_os == "win"',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
@ -15,7 +21,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'mac/format': {
|
'mac-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "mac" and host_cpu == "x64"',
|
'condition': 'host_os == "mac" and host_cpu == "x64"',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
@ -29,7 +35,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'mac_arm64/format': {
|
'mac_arm64-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "mac" and host_cpu == "arm64"',
|
'condition': 'host_os == "mac" and host_cpu == "arm64"',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
@ -43,7 +49,7 @@ deps = {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
'linux64/format': {
|
'linux64-format': {
|
||||||
'bucket': 'chromium-clang-format',
|
'bucket': 'chromium-clang-format',
|
||||||
'condition': 'host_os == "linux"',
|
'condition': 'host_os == "linux"',
|
||||||
'dep_type': 'gcs',
|
'dep_type': 'gcs',
|
||||||
|
@ -77,10 +77,10 @@ function upload_and_set {
|
|||||||
set_deps $2 $object_info
|
set_deps $2 $object_info
|
||||||
}
|
}
|
||||||
|
|
||||||
upload_and_set buildtools/linux64/clang-format linux64/format
|
upload_and_set buildtools/linux64/clang-format linux64-format
|
||||||
upload_and_set buildtools/win/clang-format.exe win/format
|
upload_and_set buildtools/win/clang-format.exe win-format
|
||||||
upload_and_set buildtools/mac/clang-format.x64 mac/format
|
upload_and_set buildtools/mac/clang-format.x64 mac-format
|
||||||
upload_and_set buildtools/mac/clang-format.arm64 mac_arm64/format
|
upload_and_set buildtools/mac/clang-format.arm64 mac_arm64-format
|
||||||
|
|
||||||
# Clean up
|
# Clean up
|
||||||
rm /tmp/clang-format-$CLANG_REV.tgz
|
rm /tmp/clang-format-$CLANG_REV.tgz
|
||||||
@ -100,7 +100,7 @@ clang-format differences by choosing patchset 1 as the base for the gerrit diff.
|
|||||||
```shell
|
```shell
|
||||||
## New gerrit CL with results of old clang-format.
|
## New gerrit CL with results of old clang-format.
|
||||||
# use old clang-format
|
# use old clang-format
|
||||||
find base -name '*.cc' -o -name '*.c' -o -name '*.h' -o -name '*.mm' | xargs ./buildtools/linux64/format/clang-format -i
|
find base -name '*.cc' -o -name '*.c' -o -name '*.h' -o -name '*.mm' | xargs ./buildtools/linux64-format/clang-format -i
|
||||||
git commit -a
|
git commit -a
|
||||||
git cl upload --bypass-hooks
|
git cl upload --bypass-hooks
|
||||||
## New patchset on gerrit CL with results of new clang-format.
|
## New patchset on gerrit CL with results of new clang-format.
|
||||||
|
Reference in New Issue
Block a user