From c340ea5d4fe3feae6d205b031dcd2d534da851fa Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Mon, 8 Apr 2024 15:55:13 +0200 Subject: [PATCH] Remove ThirdParty/container-maker --- .dockerignore | 1 - .gitmodules | 3 --- Applications/InSituLib/README.md | 6 ------ ThirdParty/container-maker | 1 - scripts/ci/extends/container-maker-setup.yml | 6 ------ scripts/ci/jobs/build-container.yml | 14 -------------- scripts/ci/pipelines/regular.yml | 2 -- 7 files changed, 33 deletions(-) delete mode 160000 ThirdParty/container-maker delete mode 100644 scripts/ci/extends/container-maker-setup.yml delete mode 100644 scripts/ci/jobs/build-container.yml diff --git a/.dockerignore b/.dockerignore index cfecf3aa1ec..bc6c2b61bc7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ # .git Tests/Data _out/images -ThirdParty/container-maker diff --git a/.gitmodules b/.gitmodules index 6333c7e3825..854c0f5d668 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "ThirdParty/container-maker"] - path = ThirdParty/container-maker - url = https://gitlab.opengeosys.org/ogs/container-maker.git [submodule "ThirdParty/ogs6py"] path = ThirdParty/ogs6py url = https://github.com/joergbuchwald/ogs6py.git diff --git a/Applications/InSituLib/README.md b/Applications/InSituLib/README.md index 9d335dd2f4d..e8347a920df 100644 --- a/Applications/InSituLib/README.md +++ b/Applications/InSituLib/README.md @@ -22,12 +22,6 @@ cmake -DCMAKE_BUILD_TYPE=Release -DOGS_USE_INSITU=ON \ -DOGS_BUILD_PROCESSES=SteadyStateDiffusion ../ogs ``` -**OR:** Build with [ogs-container-maker](https://github.com/ufz/ogs-container-maker): - -```bash -ogscm compiler.py ogs.py --cmake_args ' -DOGS_BUILD_PROCESSES=SteadyStateDiffusion' --insitu -B -C -R -``` - ### Run benchmark ```bash diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker deleted file mode 160000 index ca9223670c3..00000000000 --- a/ThirdParty/container-maker +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca9223670c32601af2945be988813c47b7fbdcd6 diff --git a/scripts/ci/extends/container-maker-setup.yml b/scripts/ci/extends/container-maker-setup.yml deleted file mode 100644 index 61d7a41a16f..00000000000 --- a/scripts/ci/extends/container-maker-setup.yml +++ /dev/null @@ -1,6 +0,0 @@ -.container-maker-setup: - before_script: - - git submodule update --init --force ThirdParty/container-maker - - cd ThirdParty/container-maker - - rm -rf _out .venv - - poetry install diff --git a/scripts/ci/jobs/build-container.yml b/scripts/ci/jobs/build-container.yml deleted file mode 100644 index 33825b75d23..00000000000 --- a/scripts/ci/jobs/build-container.yml +++ /dev/null @@ -1,14 +0,0 @@ -build container: - stage: build - tags: [envinf, shell] - needs: [meta] - extends: - - .container-maker-setup - script: - # Test local dependency builds (--pm off) - - > - poetry run ogscm compiler.py mpi.py ogs.py -B --ogs ../.. - --build_args ' --progress=plain' - --cvode --ccache --cpmcache --mfront - --pm off - --cmake_args ' -DOGS_BUILD_PROCESSES=SteadyStateDiffusion' diff --git a/scripts/ci/pipelines/regular.yml b/scripts/ci/pipelines/regular.yml index 6f37a485475..cfc7735b7c4 100644 --- a/scripts/ci/pipelines/regular.yml +++ b/scripts/ci/pipelines/regular.yml @@ -7,7 +7,6 @@ include: - local: "/scripts/ci/pipelines/mac.yml" - local: "/scripts/ci/pipelines/win.yml" - local: "/scripts/ci/jobs/build-docs.yml" - - local: "/scripts/ci/jobs/build-container.yml" - local: "/scripts/ci/jobs/jupyter.yml" - local: "/scripts/ci/jobs/code-quality.yml" - local: "/scripts/ci/jobs/code-coverage.yml" @@ -18,7 +17,6 @@ include: - local: "/scripts/ci/jobs/web-preview.yml" - local: "/scripts/ci/jobs/web-check.yml" - local: "/scripts/ci/jobs/web-deploy.yml" - - local: "/scripts/ci/jobs/container.yml" - local: "/scripts/ci/jobs/release.yml" - local: "/scripts/ci/jobs/package.yml" -- GitLab