diff --git a/.github/actions/clang-format/action.yml b/.github/actions/clang-format/action.yml
index b81af54f..65d6d374 100644
--- a/.github/actions/clang-format/action.yml
+++ b/.github/actions/clang-format/action.yml
@@ -6,7 +6,7 @@ inputs:
   version:
     description: LLVM version to use # Should be kept roughly in sync with arcanist
     required: false
-    default: 12
+    default: 18
 
 runs:
   using: "composite"
diff --git a/.github/actions/setup-cpp/action.yml b/.github/actions/setup-cpp/action.yml
index 4f618267..f3aece30 100644
--- a/.github/actions/setup-cpp/action.yml
+++ b/.github/actions/setup-cpp/action.yml
@@ -16,6 +16,7 @@ runs:
       if: ${{ inputs.toolchain == 'Clang' }}
       shell: bash
       run: |
+        sudo apt-get install -y libc++-dev libc++abi-dev
         echo "CC=/usr/bin/clang" >> $GITHUB_ENV
         echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
         echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
diff --git a/.github/workflows/validate-cpp.yml b/.github/workflows/validate-cpp.yml
index e2c159d1..1d9ba8d1 100644
--- a/.github/workflows/validate-cpp.yml
+++ b/.github/workflows/validate-cpp.yml
@@ -107,3 +107,5 @@ jobs:
 
       - name: clang-format
         uses: ./.github/actions/clang-format
+        with:
+          directory: yoga