Skip to content
Snippets Groups Projects
Commit 41d937d2 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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

parent ab6fd15d
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -43,7 +43,6 @@ jobs: ...@@ -43,7 +43,6 @@ jobs:
BUILDSCRIPTS_SHARED: ${{ github.workspace }}/.shared BUILDSCRIPTS_SHARED: ${{ github.workspace }}/.shared
# extracted and committed to viewer repo # extracted and committed to viewer repo
BUILDSCRIPTS_SUPPORT_FUNCTIONS: ${{ github.workspace }}/buildscripts_support_functions BUILDSCRIPTS_SUPPORT_FUNCTIONS: ${{ github.workspace }}/buildscripts_support_functions
git_hooks_checkout: ${{ github.workspace }}/.git-hooks
GIT_REF: ${{ github.head_ref || github.ref }} GIT_REF: ${{ github.head_ref || github.ref }}
LL_SKIP_REQUIRE_SYSROOT: 1 LL_SKIP_REQUIRE_SYSROOT: 1
# Setting this variable directs Linden's TUT test driver code to capture # Setting this variable directs Linden's TUT test driver code to capture
...@@ -72,12 +71,6 @@ jobs: ...@@ -72,12 +71,6 @@ jobs:
ref: viewer ref: viewer
path: .build-variables path: .build-variables
- name: Checkout git-hooks
uses: actions/checkout@v3
with:
repository: secondlife/git-hooks
path: .git-hooks
- name: Checkout master-message-template - name: Checkout master-message-template
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
......
...@@ -328,9 +328,13 @@ then ...@@ -328,9 +328,13 @@ then
pip install -r "$(native_path "$git_hooks_reqs")" || \ pip install -r "$(native_path "$git_hooks_reqs")" || \
fatal "pip install git-hooks failed" fatal "pip install git-hooks failed"
fi fi
# validate the branch we're about to build git_hooks_script="$git_hooks_checkout/coding_policy_git.py"
python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \ if [[ -r "$(shell_path "$git_hooks_script")" ]]
fatal "coding policy check failed" 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 fi
end_section "coding policy check" end_section "coding policy check"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment