From d1bdef8b92bdfd58ef9728df8b2f7771017b0685 Mon Sep 17 00:00:00 2001 From: seu Date: Sun, 29 Oct 2017 00:18:25 +0200 Subject: [PATCH 1/3] don't checkout, map! --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 41ac288f0..fd4c629c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,5 @@ script: | docker run \ --name neopg-build-env \ --rm neopg-build-env \ - sh -c "git clone https://github.com/lambdafu/neopg.git && cd neopg/build && git checkout $TRAVIS_COMMIT && git submodule update --init && cmake -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . && make test && make coverage" + --volume $TRAVIS_BUILD_DIR:/neopg \ + sh -c "cd neopg/build && git submodule update --init && cmake -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . && make test && make coverage" From 70d18e7668c098c66919bad58619432b99f07eef Mon Sep 17 00:00:00 2001 From: seu Date: Sun, 29 Oct 2017 00:41:15 +0200 Subject: [PATCH 2/3] use pre-built docker container --- .travis.yml | 7 ++++--- prov/Dockerfile | 10 ---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd4c629c2..8b1da2620 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,12 @@ services: - docker install: | - docker build -t neopg-build-env prov + docker pull labor/neopg-build script: | docker run \ - --name neopg-build-env \ - --rm neopg-build-env \ + --name neopg-build \ + --rm \ + labor/neopg-build \ --volume $TRAVIS_BUILD_DIR:/neopg \ sh -c "cd neopg/build && git submodule update --init && cmake -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . && make test && make coverage" diff --git a/prov/Dockerfile b/prov/Dockerfile index 7242d7f0c..887bf486e 100644 --- a/prov/Dockerfile +++ b/prov/Dockerfile @@ -27,13 +27,3 @@ RUN cd botan \ && git checkout 2.3.0 \ && ./configure.py \ && make install - -ENV GIT_COMMIT=master -#ENTRYPOINT git clone https://github.com/lambdafu/neopg.git \ -# && cd neopg \ -# && git checkout $GIT_COMMIT \ -# && cd build \ -# && cmake -DCMAKE_BUILD_TYPE=Debug .. \ -# && cmake --build \ -# && make test -##tail -F /var/log/messages From 7402bc0caefba22c86db789942e985b93ab8d2cd Mon Sep 17 00:00:00 2001 From: seu Date: Sun, 29 Oct 2017 01:34:59 +0200 Subject: [PATCH 3/3] travis syntax err --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b1da2620..1c04bd2f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ script: | docker run \ --name neopg-build \ --rm \ - labor/neopg-build \ --volume $TRAVIS_BUILD_DIR:/neopg \ + labor/neopg-build \ sh -c "cd neopg/build && git submodule update --init && cmake -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . && make test && make coverage"