Skip to content
Snippets Groups Projects
Commit 297ec8f8 authored by Lars Bilke's avatar Lars Bilke
Browse files

Use gcc 8 and CMake 3.14.7

parent a0f52106
No related branches found
No related tags found
No related merge requests found
...@@ -6,10 +6,10 @@ subprocess.run(f"python ogscm/cli.py --pm system --cvode " ...@@ -6,10 +6,10 @@ subprocess.run(f"python ogscm/cli.py --pm system --cvode "
shell=True) shell=True)
subprocess.run(f"python ogscm/cli.py --file Dockerfile.gcc.full --jenkins " subprocess.run(f"python ogscm/cli.py --file Dockerfile.gcc.full --jenkins "
"--cppcheck --docs --gcovr", "--cppcheck --docs --gcovr --compiler_version 8",
shell=True) shell=True)
subprocess.run(f"python ogscm/cli.py --file Dockerfile.gcc.gui --jenkins " subprocess.run(f"python ogscm/cli.py --file Dockerfile.gcc.gui --jenkins "
"--cppcheck --gui --gcovr", "--cppcheck --gui --gcovr --compiler_version 8",
shell=True) shell=True)
subprocess.run(f"python ogscm/cli.py --file Dockerfile.clang.full " subprocess.run(f"python ogscm/cli.py --file Dockerfile.clang.full "
"--base_image ubuntu:18.04 --compiler clang --jenkins " "--base_image ubuntu:18.04 --compiler clang --jenkins "
......
...@@ -7,10 +7,10 @@ cli.add_argument("--out", type=str, default="_out") ...@@ -7,10 +7,10 @@ cli.add_argument("--out", type=str, default="_out")
args = cli.parse_args() args = cli.parse_args()
subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.gcc.full " subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.gcc.full "
"--jenkins --cppcheck --docs --gcovr", "--jenkins --cppcheck --docs --gcovr --compiler_version 8",
shell=True) shell=True)
subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.gcc.gui " subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.gcc.gui "
"--jenkins --cppcheck --gui --gcovr", "--jenkins --cppcheck --gui --gcovr --compiler_version 8",
shell=True) shell=True)
subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.clang.full " subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.clang.full "
"--base_image ubuntu:18.04 --compiler clang --jenkins --iwyy", "--base_image ubuntu:18.04 --compiler clang --jenkins --iwyy",
......
...@@ -263,7 +263,7 @@ def main(): # pragma: no cover ...@@ -263,7 +263,7 @@ def main(): # pragma: no cover
'libxt-dev' 'libxt-dev'
]) ])
if ogscm.config.g_package_manager == package_manager.CONAN: if ogscm.config.g_package_manager == package_manager.CONAN:
Stage0 += cmake(eula=True, version='3.12.4') Stage0 += cmake(eula=True, version='3.14.7')
conan_user_home = '/opt/conan' conan_user_home = '/opt/conan'
if args.dev: if args.dev:
conan_user_home = '' conan_user_home = ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment