diff options
| author | lains <lains@caramail.com> | 2018-09-12 17:28:50 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2018-09-12 17:28:50 +0200 |
| commit | a63a78aad9ded94cb2df88c0bae9cead09150c5e (patch) | |
| tree | 9bacf117a9e316c4bd28533dc4bcdb94ac57e0e2 | |
| parent | 07de185df5dc96356a21016b544137b84b4fc023 (diff) | |
| download | navit-a63a78aad9ded94cb2df88c0bae9cead09150c5e.tar.gz | |
Fix:Circleci Fix on indentation warning and enabling xmllint on android builds (#665)
* Fixing indentation on config.yml (warning ci_sanity_checks.sh)
* Adding libxml2-utils to fix circleci error on missing xmllint command for android builds
* Remove one tailing space
* Revert "Adding libxml2-utils to fix circleci error on missing xmllint command for android builds"
This reverts commit 763f4658c1dab4ec6f900a4f3a032ffb2cf18e0b.
* Adding libxml2-utils to fix circleci error on missing xmllint command during sanity_check
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | scripts/setup_common_requirements.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d8d6ed13..3cc2d1b7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,8 +39,8 @@ jobs: steps: - checkout - run: - name: Install doxygen and other essentials - command: apt-get update && apt-get -y install doxygen ca-certificates git rsync + name: Install doxygen and other essentials + command: apt-get update && apt-get -y install doxygen ca-certificates git rsync - run: name: Run doxygen command: cd navit && doxygen diff --git a/scripts/setup_common_requirements.sh b/scripts/setup_common_requirements.sh index 7156fbadc..0ca000fa8 100644 --- a/scripts/setup_common_requirements.sh +++ b/scripts/setup_common_requirements.sh @@ -1,4 +1,4 @@ #!/bin/sh set -e -apt-get update && apt-get install -y wget unzip cmake build-essential gettext librsvg2-bin util-linux git ssh sed astyle +apt-get update && apt-get install -y wget unzip cmake build-essential gettext librsvg2-bin util-linux git ssh sed astyle libxml2-utils |