Merge 02bdc51da5 into 30a8f963f7

.github/workflows/autobuild.yaml

@@ -158,7 +158,6 @@ jobs:
             "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded"
             "-DLLVM_ENABLE_PDB=ON"
             "-DLLVM_PARALLEL_LINK_JOBS=1"
-          grpc_version: v1.36.3
           grpc_cmake: >-
             "-DgRPC_MSVC_STATIC_RUNTIME=ON"
           binary_extension: ".exe"
@@ -178,22 +177,26 @@ jobs:
         #   grpc_cmake: >-
         #     "-DgRPC_MSVC_STATIC_RUNTIME=ON"
         #   binary_extension: ".exe"
-        - name: mac
-          runner: macos-14
+        - name: mac-x64
+          runner: macos-13
           preinstall: brew install ninja zlib p7zip
           cflags: -O3 -gline-tables-only -DNDEBUG
           cmake: >-
             "-DCMAKE_C_COMPILER=clang"
             "-DCMAKE_CXX_COMPILER=clang++"
             "-DLLVM_ENABLE_ZLIB=FORCE_ON"
-            "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
+            "-DCMAKE_OSX_ARCHITECTURES=x86_64"
             "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
-            "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-            "-Dabsl_DIR=$HOME/grpc-installation/lib/cmake/absl"
-          grpc_version: v1.51.3
-          # BoringSSL doesn't support universal binaries when building with ASM.
-          grpc_cmake: >-
-            "-DOPENSSL_NO_ASM=ON"
+        - name: mac-arm64
+          runner: macos-latest
+          preinstall: brew install ninja zlib p7zip
+          cflags: -O3 -gline-tables-only -DNDEBUG
+          cmake: >-
+            "-DCMAKE_C_COMPILER=clang"
+            "-DCMAKE_CXX_COMPILER=clang++"
+            "-DLLVM_ENABLE_ZLIB=FORCE_ON"
+            "-DCMAKE_OSX_ARCHITECTURES=arm64"
+            "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0"
         - name: linux-x64
           runner: ubuntu-latest
           container: ubuntu:20.04
@@ -214,7 +217,6 @@ jobs:
             "-DLLVM_STATIC_LINK_CXX_STDLIB=ON"
             "-DLLVM_ENABLE_ZLIB=FORCE_ON"
             "-DCMAKE_PROJECT_INCLUDE=$GITHUB_WORKSPACE/.github/workflows/linux-static-deps.cmake"
-          grpc_version: v1.36.3
           # Using c-ares as a module prevents dynamic linking of unneeded
           # libraries. All other gRPC dependencies can be built from sources.
           grpc_cmake: >-
@@ -239,7 +241,6 @@ jobs:
             "-DLLVM_STATIC_LINK_CXX_STDLIB=ON"
             "-DLLVM_ENABLE_ZLIB=FORCE_ON"
             "-DCMAKE_PROJECT_INCLUDE=$GITHUB_WORKSPACE/.github/workflows/linux-static-deps.cmake"
-          grpc_version: v1.36.3
           grpc_cmake: >-
             "-DgRPC_CARES_PROVIDER=package"
     runs-on: ${{ matrix.config.runner }}
@@ -271,7 +272,7 @@ jobs:
         # We use the same version of gRPC for LLVM's clangd-ubuntu-tsan
         # buildbot.
         # https://github.com/llvm/llvm-zorg/blob/main/buildbot/google/docker/buildbot-clangd-ubuntu-clang/Dockerfile
-        ref: ${{ matrix.config.grpc_version }} 
+        ref: v1.36.3
         submodules: recursive
     - name: Build gRPC
       run: >

.github/workflows/winget.yml

@@ -1,54 +0,0 @@
-name: Publish on Windows Package Manager
-
-on:
-  release:
-    types: [released]
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: Release tag (version)
-        required: true
-
-jobs:
-  publish-winget:
-    name: Publish
-    runs-on: windows-latest
-    steps:
-      - name: Configure parameters
-        id: params
-        run: |
-          if ("${{ github.event_name }}" -eq "release") {
-            # Sometimes assets aren't immediately available, so we wait a bit for the first run
-            ${{ github.run_attempt == 1 && 'Start-Sleep -Seconds 300' || '' }}
-            
-            echo "assets_url=${{ github.event.release.assets_url }}" >> $env:GITHUB_OUTPUT
-            echo "version=${{ github.event.release.tag_name }}" >> $env:GITHUB_OUTPUT
-          } else {
-            $releaseUrl = "$env:GITHUB_API_URL/repos/clangd/clangd/releases/tags/${{ github.event.inputs.tag_name }}"
-            $assetsUrl = curl -sL $releaseUrl | ConvertFrom-Json | Select-Object -ExpandProperty assets_url
-            
-            echo "assets_url=$assetsUrl" >> $env:GITHUB_OUTPUT
-            echo "version=${{ github.event.inputs.tag_name }}" >> $env:GITHUB_OUTPUT
-          }
-
-      - name: Set up Komac
-        run: |
-          $releaseUrl = "$env:GITHUB_API_URL/repos/russellbanks/Komac/releases/latest"
-          $downloadUrl = curl -sL $releaseUrl | ConvertFrom-Json
-            | Select-Object -ExpandProperty assets
-            | Where-Object -Property name -like "komac-*-x86_64-pc-windows-msvc.exe"
-            | Select-Object -ExpandProperty browser_download_url
-            | Select-Object -First 1
-          curl -sL $downloadUrl -o komac.exe
-          ./komac --version
-
-      - name: Submit package
-        env:
-          GITHUB_TOKEN: ${{ secrets.WINGET_TOKEN }}
-        run: |
-          $releaseUrl = curl -sL ${{ steps.params.outputs.assets_url }} | ConvertFrom-Json
-            | Where-Object -Property name -like "clangd-windows-*.zip"
-            | Select-Object -ExpandProperty browser_download_url
-          
-          ./komac sync-fork
-          ./komac update LLVM.clangd -v ${{ steps.params.outputs.version }} -u $releaseUrl -s