Fix auto-updates of RobustToolbox on Windows (#33323)

* Fix auto-updates of RobustToolbox on Windows

* Also fix hooks

* Upgrade version of hooks in git_helper script

diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
index 4bd7fcf78c3c417c4208c721316586acd1697486..c0a0c9e1f37f7fefb217cb0091f54f1f626b080a 100644 (file)
--- a/BuildChecker/BuildChecker.csproj
+++ b/BuildChecker/BuildChecker.csproj
@@ -15,7 +15,6 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Python>python3</Python>
-    <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
     <TargetFramework>net4.7.2</TargetFramework>
     <RestorePackages>false</RestorePackages>

diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
index becd4506e820df62b1f73a3b97c6295c4aa3953e..83c41c3403a5bd79f81cf576697f7a3d1f5b52b7 100644 (file)
--- a/BuildChecker/git_helper.py
+++ b/BuildChecker/git_helper.py
@@ -10,7 +10,7 @@ from typing import List
 
 SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
 # If this doesn't match the saved version we overwrite them all.
-CURRENT_HOOKS_VERSION = "2"
+CURRENT_HOOKS_VERSION = "3"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
 
 

diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
index c5662445c272597c24ed2457d4de771cafd28bfa..f34ffd293de320144463b419d4e0e7f98253fb3c 100755 (executable)
--- a/BuildChecker/hooks/post-checkout
+++ b/BuildChecker/hooks/post-checkout
@@ -4,10 +4,4 @@ gitroot=`git rev-parse --show-toplevel`
 
 cd "$gitroot/BuildChecker"
 
-if [[ `uname` == MINGW* || `uname` == CYGWIN* ]]; then
-    # Windows
-    py -3 git_helper.py --quiet
-else
-    # Not Windows, so probably some other Unix thing.
-    python3 git_helper.py --quiet
-fi
+python3 git_helper.py --quiet