Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CI badge in README.asciidoc #2545

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.asciidoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/Contributing.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/generate-documentation
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down