From b1c1cb96b5c91c0134660d735ea554fef536dc70 Mon Sep 17 00:00:00 2001 From: Nikolai Korolev Date: Thu, 17 Apr 2025 12:45:35 +0100 Subject: [PATCH] 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 --- BuildChecker/BuildChecker.csproj | 1 - BuildChecker/git_helper.py | 2 +- BuildChecker/hooks/post-checkout | 8 +------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj index 4bd7fcf78c..c0a0c9e1f3 100644 --- a/BuildChecker/BuildChecker.csproj +++ b/BuildChecker/BuildChecker.csproj @@ -15,7 +15,6 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild python3 - py -3 {C899FCA4-7037-4E49-ABC2-44DE72487110} net4.7.2 false diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py index becd4506e8..83c41c3403 100644 --- 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 c5662445c2..f34ffd293d 100755 --- 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 -- 2.51.2