diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-30 18:10:39 -0800 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-30 18:10:39 -0800 |
| commit | 320a42e29f3ae0d56f35d12b653d36f3c688f4a9 (patch) | |
| tree | 4c2905fd49040394464c504ae3e1c158d848a21c | |
| parent | d9c1d9f90d21293a3702c457bdbbe06555980a2d (diff) | |
| download | navit-320a42e29f3ae0d56f35d12b653d36f3c688f4a9.tar.gz | |
Moving the linux bin to a more generic place to match other builds
| -rw-r--r-- | ci/build_linux.sh | 8 | ||||
| -rw-r--r-- | circle.yml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 5cbd2039a..3fb730dca 100644 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -8,8 +8,8 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH - mkdir bin && cd bin - cov-build --dir cov-int cmake ../ ${cmake_opts} + mkdir ~/linux-bin && cd ~/linux-bin + cov-build --dir cov-int cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts} cov-build --dir cov-int make || exit -1 tar czvf navit.tgz cov-int @@ -26,8 +26,8 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun 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=@po/navit.pot | grep title else - mkdir bin && cd bin - cmake ../ ${cmake_opts} || exit -1 + mkdir ~/linux-bin && cd ~/linux-bin + cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts} || exit -1 make || exit -1 fi diff --git a/circle.yml b/circle.yml index b3ccc4dab..9ff4ee7a9 100644 --- a/circle.yml +++ b/circle.yml @@ -32,15 +32,15 @@ test: - 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/ + pwd: ~/linux-bin/navit/ - sed -i -e 's@name="Demo" profilename="car" enabled="no" active="yes"@name="Demo" profilename="car" enabled="yes" active="yes" follow="1" refresh="1"@' navit.xml: - pwd: bin/navit/ + pwd: ~/linux-bin/navit/ - sed -i -e 's@type="internal" enabled@type="internal" fullscreen="1" font_size="350" enabled@' navit.xml: - pwd: bin/navit/ + pwd: ~/linux-bin/navit/ - sed -i -e 's@libbinding_dbus.so" active="no"@libbinding_dbus.so" active="yes"@' navit.xml: - pwd: bin/navit/ + pwd: ~/linux-bin/navit/ - ./navit: - pwd: bin/navit/ + pwd: ~/linux-bin/navit/ background: true - sleep 5 - import -window root $CIRCLE_ARTIFACTS/default.png |