Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit 85ced99

Browse files
committed
.travis: Run tests on debian 10 as well
This differs from the debian 9 docker file in the fact that we need python2 as well for one of the test scripts.
1 parent 6f2fc50 commit 85ced99

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ language: cpp
44

55
env:
66
matrix:
7-
- OS_TYPE=debian9 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
8-
- OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON NON_STOCK_CPPZMQ=OFF
9-
- OS_TYPE=debian7 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
7+
- OS_TYPE=debian10 CMAKE_BUILD_TYPE=Release SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
8+
- OS_TYPE=debian10 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
9+
- OS_TYPE=debian9 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
10+
- OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON NON_STOCK_CPPZMQ=OFF
11+
- OS_TYPE=debian7 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=OFF COVERALLS=OFF NON_STOCK_CPPZMQ=ON
1012

1113
notifications:
1214
email: false

.travis/debian10/Dockerfile

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM debian:buster
2+
3+
ARG APP_UID=2000
4+
5+
ARG APP_GID=2000
6+
7+
MAINTAINER TANGO Controls team <tango@esrf.fr>
8+
9+
RUN apt-get update && apt-get install -y apt-utils
10+
11+
RUN apt-get install -y build-essential cmake
12+
13+
RUN apt-get install -y curl lsb-release
14+
15+
RUN apt-get install -y omniidl libomniorb4-dev libcos4-dev libomnithread4-dev libzmq3-dev
16+
17+
RUN apt-get install -y python2
18+
19+
RUN groupadd -g "$APP_GID" tango
20+
21+
RUN useradd -u "$APP_UID" -g "$APP_GID" -ms /bin/bash tango
22+
23+
ENV PKG_CONFIG_PATH=/home/tango/lib/pkgconfig
24+
25+
USER tango
26+
27+
WORKDIR /home/tango

0 commit comments

Comments
 (0)