SL-18837: Don't try to engage git-hooks explicitly at all.

2 files changed, 7 insertions, 10 deletions

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e7608657e3..40759823ad 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -43,7 +43,6 @@ jobs:
       BUILDSCRIPTS_SHARED: ${{ github.workspace }}/.shared
       # extracted and committed to viewer repo
       BUILDSCRIPTS_SUPPORT_FUNCTIONS: ${{ github.workspace }}/buildscripts_support_functions
-      git_hooks_checkout: ${{ github.workspace }}/.git-hooks
       GIT_REF: ${{ github.head_ref || github.ref }}
       LL_SKIP_REQUIRE_SYSROOT: 1
       # Setting this variable directs Linden's TUT test driver code to capture
@@ -72,12 +71,6 @@ jobs:
           ref: viewer
           path: .build-variables
 
-      - name: Checkout git-hooks
-        uses: actions/checkout@v3
-        with:
-          repository: secondlife/git-hooks
-          path: .git-hooks
-
       - name: Checkout master-message-template
         uses: actions/checkout@v3
         with:
diff --git a/build.sh b/build.sh
index 44c7d66640..86119cf259 100755
--- a/build.sh
+++ b/build.sh
@@ -328,9 +328,13 @@ then
         pip install -r "$(native_path "$git_hooks_reqs")" || \
             fatal "pip install git-hooks failed"
     fi
-    # validate the branch we're about to build
-    python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
-        fatal "coding policy check failed"
+    git_hooks_script="$git_hooks_checkout/coding_policy_git.py"
+    if [[ -r "$(shell_path "$git_hooks_script")" ]]
+    then
+        # validate the branch we're about to build
+        python_cmd "$(native_path "$git_hooks_script")" --all_files || \
+            fatal "coding policy check failed"
+    fi
 fi
 end_section "coding policy check"