diff options
| author | Patrick Höhn <hoehnp@gmx.de> | 2018-10-05 16:25:22 +0200 |
|---|---|---|
| committer | Patrick Höhn <hoehnp@gmx.de> | 2018-10-05 16:25:22 +0200 |
| commit | 01e8733d4c3390db9cd23a565b5f51784be2923a (patch) | |
| tree | 6a412fc4c91a8d9af992b24b0ea41982c623dab6 | |
| parent | 3004c40f42a70e3e8cb19cca331da89f3e4a96db (diff) | |
| download | navit-01e8733d4c3390db9cd23a565b5f51784be2923a.tar.gz | |
removed patched version again
ändrad: .circleci/config.yml
| -rw-r--r-- | .circleci/config.yml | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index b084029e0..7693ef06a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -240,32 +240,6 @@ 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: |