Skip to content
Snippets Groups Projects
Unverified Commit 9c53127b authored by Lars Bilke's avatar Lars Bilke
Browse files

[ci] Run linux docker job in shell runner.

parent 452e7674
No related branches found
No related tags found
No related merge requests found
...@@ -3,9 +3,8 @@ build gui linux: ...@@ -3,9 +3,8 @@ build gui linux:
- .template-build-linux - .template-build-linux
- .test-artifacts - .test-artifacts
stage: build stage: build
image: $CONTAINER_GCC_GUI_IMAGE needs: [meta]
needs: [meta, ci_images] tags: [envinf, shell]
tags: [docker]
rules: rules:
- if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "master"'
- changes: - changes:
......
...@@ -30,7 +30,6 @@ ci_images: ...@@ -30,7 +30,6 @@ ci_images:
dotenv: build.env dotenv: build.env
script: script:
- | - |
echo "CONTAINER_GCC_GUI_IMAGE=${CONTAINER_REGISTRY}/gcc-gui:${CONTAINER_TAG}" >> build.env
echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env
echo "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env echo "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env
echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env
...@@ -40,12 +39,6 @@ ci_images: ...@@ -40,12 +39,6 @@ ci_images:
- source build.env - source build.env
- !reference [.container-maker-setup, before_script] - !reference [.container-maker-setup, before_script]
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- poetry run ogscm compiler.py ogs.py --build --ogs off
--cvode --cppcheck --docs --gcovr --gui --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_GUI_IMAGE --upload
--cpu-target $CPU_TARGET
--packages build-essential
- poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off - poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off
--pm off --ccache --pm off --ccache
--version_file ../../web/data/versions.json --version_file ../../web/data/versions.json
......
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