diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-11-03 23:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 23:11:56 +0100 |
| commit | c332b256294df0156a218fd187cd001b9c494682 (patch) | |
| tree | 4a074e713a5862210cfa60561637483a055f45b8 | |
| parent | 691b7cd42d5eebd015a9abfecc2066af73481a2f (diff) | |
| parent | f334e21516af6c1cb0b96d0d341d262586c33b9b (diff) | |
| download | navit-c332b256294df0156a218fd187cd001b9c494682.tar.gz | |
Merge branch 'trunk' into compiler_warnings
| -rw-r--r-- | .circleci/config.yml | 12 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | scripts/setup_sanitycheck_requirements.sh | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d1a085d23..bb542a94d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,15 +4,16 @@ defaults: &defaults - image: ubuntu:18.04 jobs: sanity_check: - <<: *defaults + docker: + - image: navit/sanity_check:latest steps: - checkout - run: - name: Setup requirements - command: bash scripts/setup_sanitycheck_requirements.sh - - run: name: run sanity check script command: bash scripts/ci_sanity_checks.sh + - run: + name: Run CheckStyle Test + command: ./gradlew checkstyleMain build_linux: <<: *defaults steps: @@ -97,9 +98,6 @@ jobs: mkdir /home/circleci/code/test-results ./gradlew lint test - run: - name: Run CheckStyle Test - command: ./gradlew checkstyleMain - - run: name: Run Javadoc command: ./gradlew generateDebugJavadoc - store_artifacts: diff --git a/.gitignore b/.gitignore index f24de854c..698c9f5e6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /CMakeLists.txt.user* /navit/android/cmake_plugin_settings.txt /nbproject/ +navit/android/checkstyle diff --git a/scripts/setup_sanitycheck_requirements.sh b/scripts/setup_sanitycheck_requirements.sh index 263669a7c..052e47e7d 100644 --- a/scripts/setup_sanitycheck_requirements.sh +++ b/scripts/setup_sanitycheck_requirements.sh @@ -1,4 +1,4 @@ #!/bin/sh set -e -apt-get update && apt-get install -y git astyle libxml2-utils file +apt-get update && apt-get install -y git astyle libxml2-utils file openjdk-11-jre |