diff options
| author | Joseph Herlant <herlantj@gmail.com> | 2017-10-29 16:58:28 -0700 |
|---|---|---|
| committer | Joseph Herlant <herlantj@gmail.com> | 2017-10-29 16:58:28 -0700 |
| commit | dc9a44bc3c5c98190b308e8a7f57e85a8624ebd1 (patch) | |
| tree | 591d06ecacb80234dac835ec50c18417dc3de62a | |
| parent | f498bd49338258b224df26e68f6ea7bcb82f9052 (diff) | |
| download | navit-dc9a44bc3c5c98190b308e8a7f57e85a8624ebd1.tar.gz | |
native branch filtering is not working, switching to good old if
| -rw-r--r-- | .circleci/config.yml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index abd97b9ec..df706dae8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,19 +26,22 @@ jobs: - run: name: Update results to Github command: | - mkdir /root/.ssh - chmod 0600 /root/.ssh - echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts - git clone -b gh-pages git@github.com:navit-gps/navit.git /root/navit-doc - cd /root/navit-doc - git config --global push.default simple - git config user.name "Circle CI" - git config user.email "circleci@navit-project.org" - rsync -vrtza --delete /root/project/doc/html /root/navit-doc - echo "" > .nojekyll - git add . - git commit -am "Update doc for commit ${CIRCLE_SHA1}" - git push + # Because the branch filtering does not work for now + if [ "${CIRCLE_BRANCH}" == "doxygen" ]; + mkdir /root/.ssh + chmod 0600 /root/.ssh + echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts + git clone -b gh-pages git@github.com:navit-gps/navit.git /root/navit-doc + cd /root/navit-doc + git config --global push.default simple + git config user.name "Circle CI" + git config user.email "circleci@navit-project.org" + rsync -vrtza --delete /root/project/doc/html /root/navit-doc + echo "" > .nojekyll + git add . + git commit -am "Update doc for commit ${CIRCLE_SHA1}" + git push + fi - store_artifacts: path: /root/project/doc build_android_arm: @@ -132,10 +135,7 @@ workflows: version: 2 doxygen: jobs: - - run_doxygen: - filters: - branches: - ignore: gh-pages + - run_doxygen build_all: jobs: - build_linux |