diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker index a7e952f1bf9b9950c1808c098a91bb65d46db2e4..a3ab772441c3e2574474603129f956bce096414e 160000 --- a/ThirdParty/container-maker +++ b/ThirdParty/container-maker @@ -1 +1 @@ -Subproject commit a7e952f1bf9b9950c1808c098a91bb65d46db2e4 +Subproject commit a3ab772441c3e2574474603129f956bce096414e diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml index 56e8c95194fea9b62213d4ee8eb61e5d68e83974..cebf249d996d322638bf444d2b642c3abe7bd87e 100644 --- a/scripts/ci/jobs/build_image.yml +++ b/scripts/ci/jobs/build_image.yml @@ -12,7 +12,7 @@ build container images: script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - poetry run ogscm compiler.py ogs.py --build --ogs off - --pm system --cvode --cppcheck --docs --gcovr --tfel --ccache + --pm system --cvode --cppcheck --docs --gcovr --mfront --ccache --tag $CONTAINER_GCC_IMAGE --upload - poetry run ogscm compiler.py ogs.py --build --ogs off --pm system --cvode --cppcheck --docs --gcovr --gui --ccache diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml index 0ee94ee64f7127957cda058e691914f2512ba184..bb777cb4d4323912f2c8cbe594e2186f646cc6dd 100644 --- a/scripts/ci/jobs/container.yml +++ b/scripts/ci/jobs/container.yml @@ -19,7 +19,7 @@ container: - > poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../.. --build_args ' --progress=plain' - --pm system --cvode --ccache + --pm system --cvode --ccache --mfront --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DBUILD_TESTING=OFF' $DOCKER_TAG - >