File tree Expand file tree Collapse file tree 7 files changed +25
-18
lines changed Expand file tree Collapse file tree 7 files changed +25
-18
lines changed Original file line number Diff line number Diff line change @@ -18,11 +18,11 @@ set -e
18
18
pushd .docker
19
19
20
20
docker --version
21
+ docker-compose --version
22
+ docker-compose -f $DOCKER_COMPOSE config
21
23
# docker pull ubuntu:16.04
22
24
docker pull " qgis/qgis3-build-deps:${DOCKER_TAG} " || true
23
- docker build --file Dockerfile-deps \
24
- --cache-from " qgis/qgis3-build-deps:${DOCKER_TAG} " \
25
- --tag " qgis/qgis3-build-deps:${DOCKER_TAG} " .
25
+ docker build --cache-from " qgis/qgis3-build-deps:${DOCKER_TAG} " -t " qgis/qgis3-build-deps:${DOCKER_TAG} " .
26
26
# image should be pushed even if QGIS build fails
27
27
# but push is achieved only on branches (not for PRs)
28
28
if [[ $DOCKER_PUSH =~ true ]]; then
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
- set -e
3
+ # set -e
4
4
5
5
# locale-gen en_US.UTF-8
6
6
# export LANG=en_US.UTF-8
@@ -14,7 +14,7 @@ ccache -z
14
14
15
15
cd /root/QGIS
16
16
17
- sleep 20
17
+ # sleep 20
18
18
19
19
printf " [qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~ /.pg_service.conf
20
20
export PGUSER=docker
@@ -49,9 +49,15 @@ cmake \
49
49
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
50
50
export CTEST_BUILD_COMMAND=" /usr/bin/ninja"
51
51
52
+ ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centroid.*
53
+
52
54
ninja
53
55
54
- python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E " $( cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r ' /^(#.*?)?$/d' | paste -sd ' |' -) " -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
56
+ python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -R ProcessingQgisAlgorithmsTest -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
57
+
58
+ find / -iname " *.shp"
59
+
60
+ # python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
55
61
56
62
ccache -s
57
63
Original file line number Diff line number Diff line change 12
12
# (at your option) any later version. #
13
13
# #
14
14
# ##########################################################################
15
+
16
+ shopt -s expand_aliases
17
+ alias python=python3
Original file line number Diff line number Diff line change @@ -21,8 +21,6 @@ docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
21
21
22
22
mkdir -p $CCACHE_DIR
23
23
24
- docker-compose --version
25
- docker-compose -f $DOCKER_COMPOSE config
26
- docker-compose -f $DOCKER_COMPOSE run --rm qgis-build-and-test
24
+ docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
27
25
28
26
popd
Original file line number Diff line number Diff line change 1
-
2
1
FROM ubuntu:16.04
3
2
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
4
3
@@ -102,3 +101,10 @@ ENV QT_SELECT=5
102
101
# RUN cmake --version
103
102
# RUN ${CC} --version
104
103
# RUN ${CXX} --version
104
+
105
+ # RUN locale-gen en_US.UTF-8
106
+ # ENV LANG=en_US.UTF-8
107
+ # ENV LANGUAGE=en_US:en
108
+ # ENV LC_ALL=en_US.UTF-8
109
+
110
+ CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change @@ -5,21 +5,15 @@ services:
5
5
environment :
6
6
- ALLOW_IP_RANGE="172.18.0.0/16"
7
7
8
- qgis-build-and-test :
9
- build :
10
- context : .
11
- dockerfile : Dockerfile-build-test
12
- args :
13
- DOCKER_TAG : ${DOCKER_TAG}
8
+ qgis-deps :
14
9
tty : true
15
- image : qgis/qgis3-run :${DOCKER_TAG}
10
+ image : qgis/qgis3-build-deps :${DOCKER_TAG}
16
11
volumes :
17
12
- ${TRAVIS_BUILD_DIR}:/root/QGIS
18
13
- $HOME/.ccache:/root/.ccache # if changed, also change env var
19
14
links :
20
15
- postgres
21
16
environment :
22
- - DOCKER_TAG=${DOCKER_TAG}
23
17
- CCACHE_DIR=/root/.ccache
24
18
- CTEST_BUILD_DIR=/root/QGIS
25
19
- TRAVIS_BRANCH=${TRAVIS_BRANCH}
You can’t perform that action at this time.
0 commit comments