diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddc776328ba3d14d668bceda5971e0b28bb9e861..60935e2920a131a08b80c66ba2044c538ff68e16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ stages: - trigger pipelines - deploy - - solution checker variables: DUMUX_DOCKER_CI_BRANCH: master @@ -61,10 +60,4 @@ pages: paths: - public only: - - master - -apply_patches: - stage: solution checker - image: $IMAGE_REGISTRY_URL/${DUMUX_DOCKER_CI_BRANCH}_full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-22.04 - script: - - sh .patches/apply_patches.sh + - master \ No newline at end of file diff --git a/.gitlab-ci/default.yml b/.gitlab-ci/default.yml index adb8b9c29f0520a6b1aa7840e8879167d453d23a..916796f73a4d4cd645cb7087110843e10234e78a 100644 --- a/.gitlab-ci/default.yml +++ b/.gitlab-ci/default.yml @@ -2,6 +2,7 @@ default: image: $IMAGE stages: + - solution checker - configure - build - test @@ -20,6 +21,11 @@ variables: DUMUX_TRIGGER_COMMIT_SHA: "" DUMUX_TRIGGER_REF_SHA: "" +apply_patches: + stage: solution checker + script: + - sh .patches/apply_patches.sh + select tests: stage: configure before_script: