From 5ce98f244293d40873944ce04bfa9c4ee2977cf0 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Mon, 25 Nov 2019 12:52:33 +0100 Subject: [PATCH] Change CI badge in README.asciidoc --- README.asciidoc | 4 ++-- docs/Contributing.asciidoc | 6 +++--- script/generate-documentation | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index 3c4707bc8f1..b064a926b1f 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,9 +1,9 @@ -:travis-ci: image:https://api.travis-ci.org/os-autoinst/openQA.svg?branch=master[link=https://travis-ci.org/os-autoinst/openQA] +:circleci: image:https://circleci.com/gh/os-autoinst/openQA.svg?style=svg["CircleCI", link="https://circleci.com/gh/os-autoinst/openQA"] :codecov: image:https://codecov.io/gh/os-autoinst/openQA/branch/master/graph/badge.svg[link=https://codecov.io/gh/os-autoinst/openQA] = openQA -{codecov} {travis-ci} +{codecov} {circleci} openQA is a testing framework that allows you to test GUI applications on one hand and bootloader and kernel on the other. In both cases, it is difficult to diff --git a/docs/Contributing.asciidoc b/docs/Contributing.asciidoc index f9932c99a12..00c133c3c9a 100644 --- a/docs/Contributing.asciidoc +++ b/docs/Contributing.asciidoc @@ -46,8 +46,8 @@ are the right way to contribute improvements and fixes. === Rules for commits [id="rules_for_commits"] -* Every commit is checked by https://travis-ci.org/travis[Travis CI] as soon as -you create a pull request but you *should* run the tidy script locally, +* Every commit is checked in https://circleci.com/dashboard[CI] as soon as +you create a pull request, but you *should* run the tidy script locally, i.e. before every commit call: [source,sh] @@ -188,7 +188,7 @@ follows the most common Perl style conventions. * The other daemons (mentioned in the link:images/architecture.svg[architecture diagram]) are started in the same way, e.g. +script/openqa-scheduler daemon+. -* openQA will pull the required asssets on the first run. +* openQA will pull the required assets on the first run. * openQA uses SASS. Under openSUSE, installing +rubygem(sass)+ should be sufficient. * It is also useful to start openQA with morbo which allows applying changes diff --git a/script/generate-documentation b/script/generate-documentation index 367b4fb02b5..c066bd6565a 100755 --- a/script/generate-documentation +++ b/script/generate-documentation @@ -96,7 +96,7 @@ update_docs() { git add docs/api/schema topic="Update documentation to commit ${shortref}" echo "$topic" > last.commit - echo "" >> last.commit # somehow travis does not like \n + echo "" >> last.commit [[ -z "${CIRCLE_SHA1}" ]] || (cd .. && git log --pretty=fuller "${CIRCLE_SHA1}" -1 >> out/last.commit) git commit -F last.commit if [[ -n "${PUBLISH}" ]] && [[ "${PUBLISH}" != 0 ]]; then