Skip to content
Snippets Groups Projects
Verified Commit 059f052b authored by Joe Donofry's avatar Joe Donofry
Browse files

More docker changes

parent 967ebe98
No related branches found
No related tags found
No related merge requests found
...@@ -40,12 +40,13 @@ script: ...@@ -40,12 +40,13 @@ script:
# Build the lib and run the test suite against synapse. # Build the lib and run the test suite against synapse.
- | - |
if [ $TRAVIS_OS_NAME == linux ]; then if [ $TRAVIS_OS_NAME == linux ]; then
docker build -t nheko-reborn/mtxclient .
docker run -v `pwd`:/build --net=host \ docker run -v `pwd`:/build --net=host \
-e CXX_VERSION=${CXX_VERSION} \ -e CXX_VERSION=${CXX_VERSION} \
-e CC_VERSION=${CC_VERSION} \ -e CC_VERSION=${CC_VERSION} \
-e COVERAGE=${COVERAGE} \ -e COVERAGE=${COVERAGE} \
-e TRAVIS_OS_NAME=${TRAVIS_OS_NAME} \ -e TRAVIS_OS_NAME=${TRAVIS_OS_NAME} \
mujx/mtxclient-dev:0.1.0 \ nheko-reborn/mtxclient \
/bin/bash -c "./.ci/script.sh" /bin/bash -c "./.ci/script.sh"
fi fi
...@@ -60,7 +61,7 @@ after_success: ...@@ -60,7 +61,7 @@ after_success:
- | - |
if [ $COVERAGE == ON ]; then if [ $COVERAGE == ON ]; then
docker run -v `pwd`:/build \ docker run -v `pwd`:/build \
--net=host mujx/mtxclient-dev:0.1.0 \ --net=host nheko-reborn/mtxclient \
/bin/bash -c "make -C build -j1 test_coverage && ./.ci/coverage.sh" && \ /bin/bash -c "make -C build -j1 test_coverage && ./.ci/coverage.sh" && \
bash <(curl -s https://codecov.io/bash) -f "!*tests*" || echo "Codecov failed" bash <(curl -s https://codecov.io/bash) -f "!*tests*" || echo "Codecov failed"
fi fi
...@@ -78,7 +78,7 @@ RUN \ ...@@ -78,7 +78,7 @@ RUN \
cd json && \ cd json && \
cmake . && \ cmake . && \
make && \ make && \
make install make install && \
#curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \ #curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \
rm -rf /build/* && \ rm -rf /build/* && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment