mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-02-03 04:39:12 +00:00
Remove Java 8 check
This commit is contained in:
parent
21207cb405
commit
2f79849828
12
go4it
12
go4it
@ -112,23 +112,11 @@ def check_git() -> None:
|
|||||||
sys.exit(1)
|
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:
|
def build() -> None:
|
||||||
"""
|
"""
|
||||||
Merge in parent branches, then build all branches.
|
Merge in parent branches, then build all branches.
|
||||||
"""
|
"""
|
||||||
check_git()
|
check_git()
|
||||||
check_java()
|
|
||||||
|
|
||||||
# Merge each branch into the next one.
|
# Merge each branch into the next one.
|
||||||
for branch in BRANCHES:
|
for branch in BRANCHES:
|
||||||
|
Loading…
Reference in New Issue
Block a user