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

master
Nat Goodspeed 2023-06-28 17:15:06 -04:00
parent ab6fd15d61
commit 41d937d2c0
2 changed files with 7 additions and 10 deletions

View File

@ -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:

View File

@ -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"