From 018ebe3d37066b95c7f1807cdc938594e202ee66 Mon Sep 17 00:00:00 2001
From: Nick Gerleman <ngerlem@fb.com>
Date: Fri, 14 Oct 2022 07:40:52 -0700
Subject: [PATCH] format

---
 .github/actions/clang-format/action.yml  | 13 ++++++++-----
 .github/actions/setup-website/action.yml |  5 -----
 .github/workflows/publish-android.yml    |  4 +++-
 .github/workflows/publish-website.yml    |  8 +++++++-
 .github/workflows/validate-website.yml   |  8 +++++++-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.github/actions/clang-format/action.yml b/.github/actions/clang-format/action.yml
index 2f2bb01d..9e8251b9 100644
--- a/.github/actions/clang-format/action.yml
+++ b/.github/actions/clang-format/action.yml
@@ -7,8 +7,11 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: clang-format ${{ inputs.directory }}
-      uses: jidicula/clang-format-action@v4.9.0
-      with:
-        clang-format-version: '12' # This should be roughly in sync with Arcanist
-        check-path: ${{ inputs.directory }}
+    - name: Install
+      shell: bash
+      run: sudo apt install clang-format-12 # This should be roughly in sync with Arcanist
+
+    - name: clang-format
+      shell: bash
+      run: clang-format-12
+      workingDirectory: ${{ inputs.directory }}
diff --git a/.github/actions/setup-website/action.yml b/.github/actions/setup-website/action.yml
index 465a93f1..d7cfe42d 100644
--- a/.github/actions/setup-website/action.yml
+++ b/.github/actions/setup-website/action.yml
@@ -12,8 +12,3 @@ runs:
       shell: bash
       run: yarn install --frozen-lockfile
       working-directory: website
-
-    - name: yarn build
-      shell: bash
-      run: yarn build
-      working-directory: website
diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
index 01dac41a..2f995302 100644
--- a/.github/workflows/publish-android.yml
+++ b/.github/workflows/publish-android.yml
@@ -17,7 +17,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-android
+
+      - name: Setup
+        uses: ./.github/actions/setup-android
 
       - name: Write GPG secret keyring
         run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
diff --git a/.github/workflows/publish-website.yml b/.github/workflows/publish-website.yml
index 2ae71ba2..5443065d 100644
--- a/.github/workflows/publish-website.yml
+++ b/.github/workflows/publish-website.yml
@@ -13,7 +13,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-website
+
+      - name: Setup
+        uses: ./.github/actions/setup-website
+
+      - name: yarn build
+        run: yarn build
+        working-directory: website
 
       - uses: peaceiris/actions-gh-pages@v3
         with:
diff --git a/.github/workflows/validate-website.yml b/.github/workflows/validate-website.yml
index e6e6fbfd..f94c7cd2 100644
--- a/.github/workflows/validate-website.yml
+++ b/.github/workflows/validate-website.yml
@@ -9,4 +9,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-website
+
+      - name: Setup
+        uses: ./.github/actions/setup-website
+
+      - name: yarn build
+        run: yarn build
+        working-directory: website