diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml index fd2c38c620bfccfe83dd4ffb83b467733d04f501..cf3718050560921394e5f88d8c78f6586f6605cd 100644 --- a/scripts/ci/jobs/build-gui-linux.yml +++ b/scripts/ci/jobs/build-gui-linux.yml @@ -3,9 +3,8 @@ build gui linux: - .template-build-linux - .test-artifacts stage: build - image: $CONTAINER_GCC_GUI_IMAGE - needs: [meta, ci_images] - tags: [docker] + needs: [meta] + tags: [envinf, shell] rules: - if: '$CI_COMMIT_BRANCH == "master"' - changes: diff --git a/scripts/ci/jobs/ci_images.yml b/scripts/ci/jobs/ci_images.yml index c3f947845a08600c50dee1d74231736e45499378..22f69ce8aa1634d0dfe0bfb49f5d849ef248a30f 100644 --- a/scripts/ci/jobs/ci_images.yml +++ b/scripts/ci/jobs/ci_images.yml @@ -30,7 +30,6 @@ ci_images: dotenv: build.env 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 "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env @@ -40,12 +39,6 @@ ci_images: - source build.env - !reference [.container-maker-setup, before_script] - 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 --pm off --ccache --version_file ../../web/data/versions.json