Skip to content
Snippets Groups Projects

sync with docker-images branch

Merged Marco Clemencic requested to merge docker-images into master
5 files
+ 19
50
Compare changes
  • Side-by-side
  • Inline
Files
5
+ 12
10
@@ -18,11 +18,13 @@ stages:
# Templates
.build-ubuntu: &build-ubuntu
stage: build
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:${FLAVOUR}
image: ${CI_REGISTRY_IMAGE}/ubuntu:${FLAVOUR}
script:
- git submodule update --init
- cmake --version
- g++ --version
- ninja --version
- dpkg -l libfmt-dev libgit2-dev 2>/dev/null || rpm -q fmt-devel libgit2-devel
- mkdir -p build
- date +%s > build/source.stamp
- find . -type f -not -path '*/build/*' -exec touch -d @$(cat build/source.stamp) \{} \;
@@ -36,7 +38,7 @@ stages:
.test-ubuntu: &test-ubuntu
stage: test
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:${FLAVOUR}
image: ${CI_REGISTRY_IMAGE}/ubuntu:${FLAVOUR}
script:
- find . -type f -not -path '*/build/*' -exec touch -d @$(cat build/source.stamp) \{} \;
- (cd build && ctest -T test -j $(nproc))
@@ -109,7 +111,7 @@ build-ubuntu-devel:
build-centos-8:
<<: *build-ubuntu
image: gitlab-registry.cern.ch/lhcb/gitconddb/centos:8
image: ${CI_REGISTRY_IMAGE}/centos:8
# Test
test-ubuntu-latest:
@@ -138,7 +140,7 @@ test-ubuntu-devel:
test-centos-8:
<<: *test-ubuntu
image: gitlab-registry.cern.ch/lhcb/gitconddb/centos:8
image: ${CI_REGISTRY_IMAGE}/centos:8
needs:
- job: "build-centos-8"
artifacts: true
@@ -146,7 +148,7 @@ test-centos-8:
# Coverage report
build-coverage:
stage: build
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:rolling
image: ${CI_REGISTRY_IMAGE}/ubuntu:rolling
script:
- git submodule update --init
- cmake --version
@@ -164,7 +166,7 @@ build-coverage:
test-coverage:
stage: test
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:rolling
image: ${CI_REGISTRY_IMAGE}/ubuntu:rolling
needs:
- job: "build-coverage"
artifacts: true
@@ -186,13 +188,13 @@ test-coverage:
# Check formatting
code-format:
stage: build
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:latest
image: ${CI_REGISTRY_IMAGE}/ubuntu:latest
script:
- git fetch origin master
- git diff --name-only --no-renames --diff-filter MA FETCH_HEAD...HEAD | grep -E '\.(h|cpp)$' |
xargs --no-run-if-empty clang-format-11 -i --style=file || true
- git diff --name-only --no-renames --diff-filter MA FETCH_HEAD...HEAD | grep -E '\.py$' |
xargs black
xargs --no-run-if-empty black || true
- "echo \"From: Gitlab CI <noreply@cern.ch>\" > apply-formatting.patch"
- "echo \"Date: $(date -R)\" >> apply-formatting.patch"
- "echo \"Subject: [PATCH] Fixed formatting\" >> apply-formatting.patch"
@@ -215,7 +217,7 @@ code-format:
# Integration tests
integration:subdir:
stage: integration
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:latest
image: ${CI_REGISTRY_IMAGE}/ubuntu:latest
script:
- cmake --version
- g++ --version
@@ -235,7 +237,7 @@ integration:subdir:
integration:downstream:
stage: integration
image: gitlab-registry.cern.ch/lhcb/gitconddb/ubuntu:latest
image: ${CI_REGISTRY_IMAGE}/ubuntu:latest
needs:
- job: "build-ubuntu-latest"
artifacts: true
Loading