Skip to content
Snippets Groups Projects
Commit f79cc839 authored by Lars Bilke's avatar Lars Bilke Committed by Tom Fischer
Browse files

[Jenkins] Moved cppcheck to Conan GUI subjob.

parent 0bd5f661
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Jenkinsfile
+ 5
− 3
View file @ f79cc839
......@@ -123,7 +123,6 @@ pipeline {
build { target="tests" }
build { target="ctest" }
build { target="doc" }
build { target="cppcheck" }
}
}
post {
......@@ -144,8 +143,6 @@ pipeline {
],
tools: [doxygen(pattern: 'build/DoxygenWarnings.log')],
failedTotalAll: 1
recordIssues enabledForFailure: true,
tools: [cppCheck(pattern: 'build/cppcheck.log')]
}
success {
publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
......@@ -175,6 +172,8 @@ pipeline {
steps {
script {
sh 'git submodule sync'
sh 'conan remove --system-reqs Qt/5.11.2@bilke/stable'
sh 'conan remove --system-reqs VTK/8.1.1@bilke/stable'
configure {
cmakeOptions =
"-DBUILD_SHARED_LIBS=${build_shared} " +
......@@ -189,6 +188,7 @@ pipeline {
target="package"
log="build.log"
}
build { target="cppcheck" }
}
}
post {
......@@ -199,6 +199,8 @@ pipeline {
tools: [gcc4(name: 'GCC-GUI', id: 'gcc4-gui',
pattern: 'build/build.log')],
unstableTotalAll: 1
recordIssues enabledForFailure: true,
tools: [cppCheck(pattern: 'build/cppcheck.log')]
}
success { archiveArtifacts 'build/*.tar.gz,build/conaninfo.txt' }
}
......
scripts/docker/Dockerfile.clang.full
+ 9
− 1
View file @ f79cc839
FROM ubuntu:18.04
# Generated with https://github.com/ufz/ogs-container-maker/commit/7790259
# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......@@ -38,6 +38,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
# pip
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
python3-pip \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......
scripts/docker/Dockerfile.clang.minimal
+ 9
− 1
View file @ f79cc839
FROM ubuntu:18.04
# Generated with https://github.com/ufz/ogs-container-maker/commit/7790259
# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......@@ -38,6 +38,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
# pip
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
python3-pip \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......
scripts/docker/Dockerfile.gcc.full
+ 14
− 6
View file @ f79cc839
FROM ubuntu:17.10
# Generated with https://github.com/ufz/ogs-container-maker/commit/1f5dba5
# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......@@ -39,6 +39,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
# pip
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
python3-pip \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......@@ -78,13 +86,13 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.user_home=/opt/conan \
org.opengeosys.pm.conan.version=1.12.2
# cppcheck version 1.83
# cppcheck version 1.87
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.83.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/1.83.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.83 && \
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/1.83.tar.gz /var/tmp/build /var/tmp/cppcheck-1.83
rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87
ENV PATH=/usr/local/cppcheck/bin:$PATH
RUN apt-get update -y && \
......
scripts/docker/Dockerfile.gcc.gui
+ 18
− 1
View file @ f79cc839
FROM ubuntu:17.10
# Generated with https://github.com/ufz/ogs-container-maker/commit/1f5dba5
# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......@@ -39,6 +39,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
# pip
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
python3-pip \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......@@ -85,6 +93,15 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.user_home=/opt/conan \
org.opengeosys.pm.conan.version=1.12.2
# cppcheck version 1.87
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87
ENV PATH=/usr/local/cppcheck/bin:$PATH
# Package manager Conan building block
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......
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