ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-27 05:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Enable core guidelines check, build on Ubuntu 18.04

Browse Source
This commit is contained in:
Matthias Hochsteger 2018-12-10 10:57:56 +01:00
parent 6f808cb40f
commit 3679ea7e45
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.gitlab-ci.yml
View File

@ -46,15 +46,10 @@ stages:
- ls - ls
- docker info - docker info
.template_ubuntu_1510: &ubuntu_1510 .template_ubuntu: &ubuntu
<<: *ubuntu <<: *ubuntu
variables: variables:
UBUNTU_VERSION: "15.10" UBUNTU_VERSION: "18.04"
.template_ubuntu_1604: &ubuntu_1604
<<: *ubuntu
variables:
UBUNTU_VERSION: "16.04"
############################################ ############################################
# Build stage # Build stage
@ -98,18 +93,14 @@ build_netgen_win64:
.template_build_linux: &build_linux .template_build_linux: &build_linux
stage: build stage: build
script: script:
- docker build -t netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} -f tests/docker_${UBUNTU_VERSION} . - docker build -t netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} -f tests/dockerfile .
- rm -f netgen_${CI_BUILD_REF_NAME}_$UBUNTU_VERSION.id - rm -f netgen_${CI_BUILD_REF_NAME}_$UBUNTU_VERSION.id
- docker run --cidfile netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build.sh - docker run --cidfile netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build.sh
- docker commit `cat netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id` netgen_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION} - docker commit `cat netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id` netgen_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION}
- rm netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id - rm netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id
.build_ubuntu_1510: build_ubuntu:
<<: *ubuntu_1510 <<: *ubuntu
<<: *build_linux
build_ubuntu_1604:
<<: *ubuntu_1604
<<: *build_linux <<: *build_linux
@ -145,11 +136,8 @@ test_win64:
netgen_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION} netgen_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION}
bash -c 'cd /root/build/netgen && make test_netgen ARGS="-V"' bash -c 'cd /root/build/netgen && make test_netgen ARGS="-V"'
.test_ubuntu_1510: test_ubuntu:
<<: *ubuntu_1510 <<: *ubuntu
<<: *test_linux
test_ubuntu_1604:
<<: *ubuntu_1604
<<: *test_linux <<: *test_linux
############################################ ############################################

2
tests/build.sh
View File

@ -1,6 +1,6 @@
cd cd
mkdir -p build/netgen mkdir -p build/netgen
cd build/netgen cd build/netgen
cmake ../../src/netgen -DUSE_CCACHE=ON cmake ../../src/netgen -DUSE_CCACHE=ON -DENABLE_CPP_CORE_GUIDELINES_CHECK=ON
make -j12 make -j12
make install make install

4
tests/docker_16.04
View File

@ -1,4 +0,0 @@
FROM ubuntu:16.04
MAINTAINER Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
RUN apt-get update && apt-get -y install python3 libpython3-dev libxmu-dev tk-dev tcl-dev cmake git g++ libglu1-mesa-dev ccache python3-pytest python3-numpy python3-tk
ADD . /root/src/netgen

4
tests/docker_15.10 → tests/dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:15.10 FROM ubuntu:18.04
MAINTAINER Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at> MAINTAINER Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
RUN apt-get update && apt-get -y install python3 libpython3-dev libxmu-dev tk-dev tcl-dev cmake git g++ libglu1-mesa-dev ccache python3-pytest python3-numpy python3-tk RUN apt-get update && apt-get -y install python3 libpython3-dev libxmu-dev tk-dev tcl-dev cmake git g++ libglu1-mesa-dev ccache python3-pytest python3-numpy python3-tk clang-tidy
ADD . /root/src/netgen ADD . /root/src/netgen