mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-10-01 08:20:47 +00:00
Code Issues Releases Wiki Activity

Remove Java 8 check

Browse Source
This commit is contained in:
Jonathan Coates 2021-06-28 23:09:05 +01:00
parent 21207cb405
commit 2f79849828
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
go4it
View File

@ -112,23 +112,11 @@ def check_git() -> None:
sys.exit(1)
def check_java() -> None:
home = os.getenv("JAVA_HOME")
java = "java" if home is None else os.path.join(home, "bin/java")
result = subprocess.check_output([java, "-version"], encoding="utf-8", stderr=subprocess.STDOUT)
if not re.search(r"\b1\.8\.\b", result): # Who needs actual version checks!
log(f"Not running under Java 8! Things are probably not going to go well.")
sys.stdout.write(result)
sys.exit(1)
def build() -> None:
"""
Merge in parent branches, then build all branches.
"""
check_git()
check_java()
# Merge each branch into the next one.
for branch in BRANCHES: