diff options
| author | Patrick Höhn <hoehnp@users.noreply.github.com> | 2018-10-29 23:37:21 +0100 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-10-29 15:37:21 -0700 |
| commit | df9ec3f5e8703c8894887da3447c3ccbb490c91e (patch) | |
| tree | 2b4b89410ad3b41ce83ef82eafc5d0519ea5171d | |
| parent | 7a5a22c8e6b5cb687011d4302b17a9cfc13db0ca (diff) | |
| download | navit-df9ec3f5e8703c8894887da3447c3ccbb490c91e.tar.gz | |
fix: working sailfish build on circleci using machine executor (#709)
* fix: working sailfish build on circleci using machine executor
* remove travis integration as no longer needed for sailfish build
| -rw-r--r-- | .circleci/config.yml | 18 | ||||
| -rw-r--r-- | .travis.yml | 23 |
2 files changed, 18 insertions, 23 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index eecf98b57..82f300dff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,21 @@ jobs: command: bash scripts/update_doxygen.sh - store_artifacts: path: /root/project/doc + build_sailfish: + machine: true + steps: + - run: + name: install docker + command: circleci-install docker + - run: + name: make build dir and clone git repository + command: mkdir ../rpmbuild && git clone https://github.com/navit-gps/navit . + - run: + name: run build + command: ls -lah ../rpmbuild && docker run -e VERSION_ID=2.2.1.18 -v `pwd`/../rpmbuild:/home/nemo/rpmbuild:rw -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh + - store_artifacts: + name: Store rpm + path: ../rpmbuild/RPMS/ build_android_arm: working_directory: ~/code docker: @@ -257,6 +272,9 @@ workflows: - build_android_arm: requires: - sanity_check + - build_sailfish: + requires: + - sanity_check - build_win32: requires: - sanity_check diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 09919cf68..000000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -sudo: required - -language: c - -services: - - docker - -before_install: -- mkdir ../rpmbuild -- docker pull hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 -- docker run -e VERSION_ID=2.2.1.18 -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh - -before_deploy: - - provider: pages - - skip-cleanup: true - - github-token: $GITHUB_TOKEN - - keep-history: true - - local-history: `pwd`/../rpmbuild/RPMS/armv7hl/ - - local-history: `pwd`/../rpmbuild/RPMS/i586/ -before_script: skip -script: skip -after_success: skip -after_script: skip |