Skip to content

Commit

Permalink
Merge branch 'master' into DaAwesomeP-StreamingClientThroughput
Browse files Browse the repository at this point in the history
  • Loading branch information
DaAwesomeP committed Jun 22, 2023
2 parents 48976ae + 70a7f7b commit 8316511
Show file tree
Hide file tree
Showing 9 changed files with 6,106 additions and 20 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/annotation.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
image_tag: [bullseye, bookworm, sid]
image_tag: [bullseye, bookworm, trixie, sid]
architecture: [amd64]
container: debian:${{ matrix.image_tag }}
steps:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
strategy:
fail-fast: false
matrix:
image_tag: [bullseye, bookworm, sid]
image_tag: [bullseye, bookworm, trixie, sid]
architecture: [amd64]
container: debian:${{ matrix.image_tag }}
steps:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,20 @@ jobs:
uses: codespell-project/codespell-problem-matcher@v1
- name: codespell
run: ./scripts/spelling.sh codespell
weblint:
name: weblint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup Node.js v18
uses: actions/setup-node@v3
with:
node-version: 18 # LTS
cache: 'npm'
cache-dependency-path: './javascript/new-src/package-lock.json'
- name: Install npm dependencies
run: npm ci
working-directory: ./javascript/new-src
- name: Run weblint
run: npm test
working-directory: ./javascript/new-src
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/workflows/build.yaml) [![Debian Build Status](https://github.com/OpenLightingProject/ola/actions/workflows/debian.yml/badge.svg?branch=master)](https://github.com/OpenLightingProject/ola/actions/workflows/debian.yml) [![Lint Status](https://github.com/OpenLightingProject/ola/actions/workflows/lint.yaml/badge.svg?branch=master)](https://github.com/OpenLightingProject/ola/actions/workflows/lint.yaml) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/github/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/github/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 Actions on pull requests.

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

0 comments on commit 8316511

Please sign in to comment.