DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use git exec candidate list on all platforms for build" (flutter/engine#34844)

Browse Source
This commit is contained in:
Loïc Sharma 2022-07-22 10:45:04 -07:00 committed by GitHub
parent 85d5b523aa
commit 64c83cfc87
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/src/flutter/build/git_revision.py
View File

@ -10,7 +10,11 @@ import sys
import subprocess
import os
import argparse
from shutil import which # Natively supported since python 3.3
def is_windows():
os_id = sys.platform
return os_id.startswith('win32') or os_id.startswith('cygwin')
def get_repository_version(repository):
@ -18,12 +22,9 @@ def get_repository_version(repository):
if not os.path.exists(repository):
raise IOError('path does not exist')
git_candidates = ['git', 'git.sh', 'git.bat']
git = next(filter(which, git_candidates), None)
if git is None:
candidates = "', '".join(git_candidates)
raise IOError(f"Looks like GIT is not on the path. Tried '{candidates}'")
git = 'git'
if is_windows():
git = 'git.bat'
version = subprocess.check_output([
git,
'-C',

15
engine/src/flutter/tools/githooks/setup.py
View File

@ -10,7 +10,6 @@ Sets up githooks.
import os
import subprocess
import sys
from shutil import which # Natively supported since python 3.3
SRC_ROOT = os.path.dirname(
os.path.dirname(
@ -20,13 +19,17 @@ SRC_ROOT = os.path.dirname(
FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
def IsWindows():
os_id = sys.platform
return os_id.startswith('win32') or os_id.startswith('cygwin')
def Main(argv):
git = 'git'
githooks = os.path.join(FLUTTER_DIR, 'tools', 'githooks')
git_candidates = ['git', 'git.sh', 'git.bat']
git = next(filter(which, git_candidates), None)
if git is None:
candidates = "', '".join(git_candidates)
raise IOError(f"Looks like GIT is not on the path. Tried '{candidates}'")
if IsWindows():
git = 'git.bat'
githooks = os.path.join(githooks, 'windows')
result = subprocess.run([
git,
'config',