Verified Commit 5985758f authored by Lars Bilke's avatar Lars Bilke

[ci] Fix image build.

parent cb661ac8
......@@ -39,8 +39,8 @@ include:
- local: '/scripts/ci/extends/vs2019-environment.yml'
- local: '/scripts/ci/extends/test-artifacts.yml'
- local: '/scripts/ci/jobs/meta.yml'
# jobs, can be indiviually disabled for testing
- local: '/scripts/ci/jobs/pre-commit.yml'
# jobs, can be indiviually disabled for testing
- local: '/scripts/ci/jobs/build_image.yml'
- local: '/scripts/ci/jobs/build-linux.yml'
- local: '/scripts/ci/jobs/build-linux-petsc.yml'
......
......@@ -24,7 +24,7 @@ build container images:
build xunit-to-junit image:
stage: .pre
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- scripts/docker/saxon/**/*
- scripts/ci/jobs/build_image.yml
......@@ -39,7 +39,7 @@ build xunit-to-junit image:
build pre-commit image:
stage: .pre
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- scripts/docker/Dockerfile.pre-commit
- scripts/ci/jobs/build_image.yml
......@@ -53,7 +53,7 @@ build pre-commit image:
build web image:
stage: .pre
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_PROJECT_NAMESPACE == "bilke" || $CI_PROJECT_NAMESPACE == "ogs"'
changes:
- scripts/docker/Dockerfile.web
- scripts/ci/jobs/build_image.yml
......
......@@ -2,7 +2,7 @@ clang sanitizer:
stage: check
extends:
- .rules-manual
dependencies: [meta_container]
needs: ["pre commit"]
variables:
BUILD_DIR: "build-sanitizer"
CMAKE_ARGS: "-DOGS_ADDRESS_SANITIZER=ON -DOGS_UNDEFINED_BEHAVIOR_SANITIZER=ON -DOGS_BUILD_UTILS=ON"
......
......@@ -2,7 +2,7 @@ clang tidy:
stage: check
extends:
- .rules-manual
dependencies: [meta_container]
needs: ["pre commit"]
variables:
BUILD_DIR: "build-tidy"
CMAKE_ARGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DCMAKE_CXX_CLANG_TIDY=clang-tidy-9"
......
cppcheck:
stage: check
image: $CONTAINER_GCC_IMAGE
dependencies: [meta_container]
needs: ["pre commit"]
before_script:
- mkdir -p build
- cd build
......
......@@ -4,7 +4,7 @@ web url checker:
tags: [ docker ]
extends:
- .rules-manual
dependencies: [meta_container]
needs: ["pre commit"]
image: $WEB_IMAGE
script:
- cd web
......@@ -18,7 +18,7 @@ preview web site:
stage: build
tags: [ docker ]
image: $WEB_IMAGE
dependencies: [meta_container]
needs: ["pre commit"]
script:
# HACK to easier linking to the generated pages
- echo '<meta http-equiv="REFRESH" content="0;URL=web/public/index.html">' >> WebPreview.html
......@@ -43,7 +43,7 @@ preview web site:
deploy web site:
stage: package
image: $WEB_IMAGE
dependencies: [meta_container]
needs: ["pre commit"]
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
changes:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment