diff --git a/.github/actions/macos-update-clang/action.yml b/.github/actions/macos-update-clang/action.yml
new file mode 100644
index 0000000000000..f1cc51dbf5f5a
--- /dev/null
+++ b/.github/actions/macos-update-clang/action.yml
@@ -0,0 +1,18 @@
+name: Update clang
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        softwareupdate -l
+        label=$((softwareupdate -l 2>/dev/null | grep 'Label:' | grep -o 'Command Line Tools for Xcode.*' | head -1) || echo '')
+        if [ -n "$label" ]; then
+          softwareupdate -i "$label"
+          xcode_path=$(ls -1 '/Applications' | grep 'Xcode_.*\.app' | head -1)
+          sudo xcode-select -s "/Applications/$xcode_path"
+        else
+          echo "Not found."
+        fi
+        which clang
+        clang -v
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 909a412e796e6..e67deb8ffe4ff 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -367,6 +367,8 @@ jobs:
         uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
+      - name: Update clang
+        uses: ./.github/actions/macos-update-clang
       - name: brew
         uses: ./.github/actions/brew
       - name: ./configure
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 028255330d1fc..054f4a15286d2 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -117,6 +117,8 @@ jobs:
     steps:
       - name: git checkout
         uses: actions/checkout@v5
+      - name: Update clang
+        uses: ./.github/actions/macos-update-clang
       - name: brew
         uses: ./.github/actions/brew
       - name: ccache