Skip to content

Commit

Permalink
Merge d4cb022 into 4e0ad13
Browse files Browse the repository at this point in the history
  • Loading branch information
DaAwesomeP committed Jun 22, 2023
2 parents 4e0ad13 + d4cb022 commit 072a26d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ If you’d like to contribute code (such as a new plugin, extending an existing
feature or adding a brand new one), our preferred method is by forking us on
GitHub, committing your code to there, then opening a pull request. We can then
review and comment on your code if necessary and merge it in. It will also get
checked automatically by Travis Continuous Integration (you will see a message
within the pull request showing the status of the Travis tests); hence why we
checked automatically by GitHub Actions (you will see a message
within the pull request showing the status of the GitHub tests); hence why we
prefer pull requests to other methods such as patch submissions.

When writing code, please read the README.developer file which covers coding
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[www.openlighting.org/ola](https://www.openlighting.org/ola)

[![Build Status](https://travis-ci.com/github/OpenLightingProject/ola.svg?branch=master)](https://travis-ci.com/github/OpenLightingProject/ola) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/r/OpenLightingProject/ola?branch=master)
[![Build Status](https://github.com/OpenLightingProject/ola/actions/workflows/build.yaml/badge.svg?branch=master)](https://github.com/OpenLightingProject/ola/actions) [![Debian Build Status](https://github.com/OpenLightingProject/ola/actions/workflows/debian.yml/badge.svg?branch=master)](https://github.com/OpenLightingProject/ola/actions) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/r/OpenLightingProject/ola?branch=master)

The Open Lighting Architecture (OLA) is a framework for controlling
entertainment lighting equipment. Within the entertainment lighting industry,
Expand Down
2 changes: 1 addition & 1 deletion README.developer
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ which isn't listed there please consider submitting the formatting
configuration files.

Please run the cpplint.py script on all files before requesting a review,
alternatively it will be run automatically by Travis CI on pull requests.
alternatively it will be run automatically by GitHub CI on pull requests.

cpplint.py can be downloaded here:
https://github.com/google/styleguide/tree/gh-pages/cpplint
Expand Down

0 comments on commit 072a26d

Please sign in to comment.