diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-29 23:44:57 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-29 23:44:57 +0000 |
| commit | 60918fcdd2ce03233cf6c66dfd669f260f8b14c5 (patch) | |
| tree | dcc1aeee450308fd22ae2d8c535fc20ad965d2e1 | |
| parent | 21e0a71b2a98a34b2fed075b77f8d986fed6054d (diff) | |
| download | navit-60918fcdd2ce03233cf6c66dfd669f260f8b14c5.tar.gz | |
Enabling build parallelization
| -rw-r--r-- | ci/build_win32.sh | 6 | ||||
| -rw-r--r-- | circle.yml | 18 |
2 files changed, 13 insertions, 11 deletions
diff --git a/ci/build_win32.sh b/ci/build_win32.sh new file mode 100644 index 000000000..8a84ca5d6 --- /dev/null +++ b/ci/build_win32.sh @@ -0,0 +1,6 @@ +mkdir win32 +pushd win32 +cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package +popd + +cp win32/*.exe $CIRCLE_ARTIFACTS/ diff --git a/circle.yml b/circle.yml index 201e69fb4..2041c8b0e 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ dependencies: - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz - sudo apt-get update - bash ci/update_version.sh prepare - - bash ci/build_linux.sh +# - bash ci/build_linux.sh - sed -i '/INTEGER/d' bin/po/navit.pot - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/ - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title" @@ -24,25 +24,21 @@ dependencies: - sudo apt-get install lib32stdc++6 - sudo apt-get install lib32z1 - wget http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip && unzip -d ~ android-ndk-r13-linux-x86_64.zip - - bash ci/build_android.sh - - bash ci/build_android_x86.sh -# Tomtom minimal build - - bash ci/build_tomtom_minimal.sh # Windows build - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime - sudo apt-get install default-jdk nsis -# for sys/select.h -# - sudo apt-get install -y libc6-dev - - mkdir win32 - - cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package: - pwd: win32/ - - cp win32/*.exe $CIRCLE_ARTIFACTS/ # For python testing with junit reporting - sudo pip install junit-xml - sudo apt-get install python-dbus # - ls -la $CIRCLE_ARTIFACTS test: + + override: + - bash + parallel: true + files: + - ci/build_*.sh post: - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml: pwd: bin/navit/ |