From ab185263fa43141ff325edb8dace25f99e685c3d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 29 Jun 2021 17:45:13 -0400
Subject: SL-15500: Install git-hooks (and requirements) and run policy check

on the entire current (branch of the) viewer repo before starting any build.
---
 build.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 3b0cf97731..e059af4ded 100755
--- a/build.sh
+++ b/build.sh
@@ -280,6 +280,12 @@ python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}
 
 initialize_version # provided by buildscripts build.sh; sets version id
 
+# install the git-hooks dependencies
+pip_install -r "$git_hooks_checkout/requirements.txt"
+# validate the branch we're about to build
+python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
+    fatal "coding policy check failed"
+
 # Now run the build
 succeeded=true
 last_built_variant=
-- 
cgit v1.2.3


From 0276a325695f513df045ca5ffd97df478b23a95d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 29 Jun 2021 18:04:03 -0400
Subject: SL-15500: Use plain pip install, not pip_install shell function.

pip_install doesn't know about the '-r requirements.txt' feature.
---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index e059af4ded..24090dd747 100755
--- a/build.sh
+++ b/build.sh
@@ -281,7 +281,8 @@ python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}
 initialize_version # provided by buildscripts build.sh; sets version id
 
 # install the git-hooks dependencies
-pip_install -r "$git_hooks_checkout/requirements.txt"
+pip install -r "$git_hooks_checkout/requirements.txt" || \
+    fatal "pip install git-hooks failed"
 # validate the branch we're about to build
 python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
     fatal "coding policy check failed"
-- 
cgit v1.2.3


From d2de2f9d252be32b262b929fe7565729417d789b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 30 Jun 2021 08:11:30 -0400
Subject: SL-15500: Always have to work around Windows path incompatibilities.

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 24090dd747..64aa402fae 100755
--- a/build.sh
+++ b/build.sh
@@ -281,7 +281,7 @@ python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}
 initialize_version # provided by buildscripts build.sh; sets version id
 
 # install the git-hooks dependencies
-pip install -r "$git_hooks_checkout/requirements.txt" || \
+pip install -r "$(native_path "$git_hooks_checkout/requirements.txt")" || \
     fatal "pip install git-hooks failed"
 # validate the branch we're about to build
 python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
-- 
cgit v1.2.3


From 6460b7ac419021ca998c5f849ad382423599fc58 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 30 Jun 2021 09:48:02 -0400
Subject: SL-15500: Only run coding_policy_git.py on Mac

since it fails on Windows due to some problem in the underlying library.

Also wrap the coding policy checks in a TC log subsection.
---
 build.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 64aa402fae..961d1df30d 100755
--- a/build.sh
+++ b/build.sh
@@ -280,12 +280,21 @@ python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}
 
 initialize_version # provided by buildscripts build.sh; sets version id
 
-# install the git-hooks dependencies
-pip install -r "$(native_path "$git_hooks_checkout/requirements.txt")" || \
-    fatal "pip install git-hooks failed"
-# validate the branch we're about to build
-python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
-    fatal "coding policy check failed"
+begin_section "coding policy check"
+# On our TC Windows build hosts, the GitPython library underlying our
+# coding_policy_git.py script fails to run git for reasons we have not tried
+# to diagnose. Clearly git works fine on those hosts, or we would never get
+# this far. Running coding policy checks on one platform *should* suffice...
+if [[ "$arch" == "Darwin" ]]
+then
+    # install the git-hooks dependencies
+    pip install -r "$(native_path "$git_hooks_checkout/requirements.txt")" || \
+        fatal "pip install git-hooks failed"
+    # validate the branch we're about to build
+    python_cmd "$git_hooks_checkout/coding_policy_git.py" --all_files || \
+        fatal "coding policy check failed"
+fi
+end_section "coding policy check"
 
 # Now run the build
 succeeded=true
-- 
cgit v1.2.3