From 47c6ace88da88179b74928cbbb1477ad6d1368e4 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Mon, 26 May 2025 09:49:32 +0200 Subject: [PATCH] [TOOLS] Update clangd to v21 --- .github/workflows/build_cromite.yaml | 2 +- tools/images/cromite-build/pre-start.sh | 6 +++--- tools/images/remote-index/Dockerfile | 6 +++--- tools/images/remote-index/entry_point.sh | 2 +- tools/images/remote-index/generate.sh | 6 +++++- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml index 1780acaf..b0f590d5 100644 --- a/.github/workflows/build_cromite.yaml +++ b/.github/workflows/build_cromite.yaml @@ -434,5 +434,5 @@ jobs: gn gen --args="import(\"/home/lg/working_dir/cromite/build/cromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \ $WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \ -t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \ - /home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \ + /home/lg/working_dir/clangd_snapshot_20250518/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \ rm -rf out/clangd diff --git a/tools/images/cromite-build/pre-start.sh b/tools/images/cromite-build/pre-start.sh index 424c5bfe..1e30dac6 100644 --- a/tools/images/cromite-build/pre-start.sh +++ b/tools/images/cromite-build/pre-start.sh @@ -74,9 +74,9 @@ CXX=clang++ ./configure.py --bootstrap echo -e ${RED} -------- download clang indexer ${NC} cd $WORKSPACE/ -wget https://github.com/clangd/clangd/releases/download/17.0.3/clangd_indexing_tools-linux-17.0.3.zip -unzip clangd_indexing_tools-linux-17.0.3.zip -rm clangd_indexing_tools-linux-17.0.3.zip +wget https://github.com/clangd/clangd/releases/download/snapshot_20250518/clangd_indexing_tools-linux-snapshot_20250518.zip +unzip clangd_indexing_tools-linux-snapshot_20250518.zip +rm clangd_indexing_tools-linux-snapshot_20250518.zip echo -e ${RED} -------- download rc ${NC} cd $WORKSPACE/chromium/src diff --git a/tools/images/remote-index/Dockerfile b/tools/images/remote-index/Dockerfile index 0674978c..dafb8a90 100644 --- a/tools/images/remote-index/Dockerfile +++ b/tools/images/remote-index/Dockerfile @@ -8,9 +8,9 @@ RUN apt-get install -y --no-install-recommends python3-pip && \ RUN rm -rf /var/www/html/* #WORKDIR "/" -RUN wget https://github.com/clangd/clangd/releases/download/17.0.3/clangd_indexing_tools-linux-17.0.3.zip && \ - unzip clangd_indexing_tools-linux-17.0.3.zip && \ - rm clangd_indexing_tools-linux-17.0.3.zip +RUN wget https://github.com/clangd/clangd/releases/download/snapshot_20250518/clangd_indexing_tools-linux-snapshot_20250518.zip && \ + unzip clangd_indexing_tools-linux-snapshot_20250518.zip && \ + rm clangd_indexing_tools-linux-snapshot_20250518.zip ADD cromite.idx . ADD entry_point.sh . diff --git a/tools/images/remote-index/entry_point.sh b/tools/images/remote-index/entry_point.sh index 423d46a8..532a1786 100644 --- a/tools/images/remote-index/entry_point.sh +++ b/tools/images/remote-index/entry_point.sh @@ -1,6 +1,6 @@ #!/bin/bash -until ./clangd_17.0.3/bin/clangd-index-server \ +until ./clangd_snapshot_20250518/bin/clangd-index-server \ /cromite.idx /home/lg/working_dir/chromium/src \ --server-address="0.0.0.0:50051" \ --limit-results=99999999999 diff --git a/tools/images/remote-index/generate.sh b/tools/images/remote-index/generate.sh index 7e6f954c..fb7d613a 100644 --- a/tools/images/remote-index/generate.sh +++ b/tools/images/remote-index/generate.sh @@ -5,7 +5,9 @@ if [[ -z "${INDEX_VERSION}" ]]; then exit 1 fi -FLD=/storage/images/$INDEX_VERSION/android/true/arm64 +FLD=/storage/images/$INDEX_VERSION/android/true/x64 +test -d $FLD || FLD=/casefold/storage/images/$INDEX_VERSION/android/true/x64 +test -d $FLD || echo "wrong directory" && exit 1 cp $FLD/cromite.idx . cp $FLD/RELEASE . @@ -14,3 +16,5 @@ DOCKER_BUILDKIT=1 docker build -t uazo/bromite-remote-index:$INDEX_VERSION \ --progress plain \ --no-cache \ . + +echo RELEASE:$(cat RELEASE): TAG:$INDEX_VERSION