diff options
| author | Patrick Höhn <hoehnp@gmx.de> | 2018-10-05 15:20:46 +0200 |
|---|---|---|
| committer | Patrick Höhn <hoehnp@gmx.de> | 2018-10-05 15:20:46 +0200 |
| commit | aeda0b26c8afad11b0bbaa99e88b8ba0309fdba3 (patch) | |
| tree | d1a43e3b377b9e73348590e2a6ec5a8850e8dd59 | |
| parent | 9289c1e29d55aa25b077c3170974979f3504a094 (diff) | |
| download | navit-aeda0b26c8afad11b0bbaa99e88b8ba0309fdba3.tar.gz | |
test both patched and plain sailfish build in parallel
ändrad: .circleci/config.yml
| -rw-r--r-- | .circleci/config.yml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 7693ef06a..b084029e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -240,6 +240,32 @@ jobs: path: ../../../rpmbuild/RPMS/armv7hl - store_artifacts: path: ../../../rpmbuild/RPMS/i586 + build_sailfish_patched: + <<: *defaults + docker: + - image: hoehnp/sailfishos-platform-sdk:2.2.1.18 + steps: + - checkout + - run: + name: Correct path in build script + command: | + sed -i 's/src1/nemo/g' contrib/sailfish/build_on_sailfish_sdk.sh + - run: + name: Make build directory + command: | + mkdir $HOME/rpmbuild + - run: + name: Correct zypper command for use in docker container + command: | + sed -i 's/zypper in /zypper --non-interactive in /g' contrib/sailfish/build_on_sailfish_sdk.sh + - run: + name: Build for Sailfish_OS + command: | + export VERSION_ID=2.2.1.18 && cd contrib/sailfish/ && bash build_on_sailfish_sdk.sh + - store_artifacts: + path: ../../../rpmbuild/RPMS/armv7hl + - store_artifacts: + path: ../../../rpmbuild/RPMS/i586 merge_trunk_in_master: <<: *defaults steps: |