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

Master Resync #1868

Merged
merged 28 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7d344e0
update README build badge, replace some references to Travis with GitHub
DaAwesomeP Jun 18, 2023
abffaa1
github actions weblint
DaAwesomeP Jun 18, 2023
694de97
github actions weblint install curl
DaAwesomeP Jun 18, 2023
fff3a85
github actions weblint create package-lock.json
DaAwesomeP Jun 18, 2023
1562f33
github actions weblint job step names
DaAwesomeP Jun 18, 2023
2554fda
github actions weblint use setup-node
DaAwesomeP Jun 19, 2023
8991ca9
github actions weblint cache package-lock
DaAwesomeP Jun 19, 2023
067ec3d
github actions remove python2
DaAwesomeP Jun 19, 2023
aa6d62f
github actions weblint no container
DaAwesomeP Jun 19, 2023
b11591a
github actions weblint npm dependencies step name
DaAwesomeP Jun 19, 2023
6ca511f
github actions debian add trixie (new testing)
DaAwesomeP Jun 19, 2023
43e7654
Merge pull request #1863 from DaAwesomeP/DaAwesomeP-GitHubActionsWeblint
peternewman Jun 21, 2023
0e8eb89
Merge branch '0.10' into DaAwesomeP-GitHubActionsDebianBuildsTrixie
peternewman Jun 21, 2023
4520224
Merge branch '0.10' into DaAwesomeP-GitHubActionsRemovePython2
peternewman Jun 21, 2023
447f90a
Merge pull request #1865 from DaAwesomeP/DaAwesomeP-GitHubActionsRemo…
peternewman Jun 21, 2023
c3d6102
Merge branch '0.10' into DaAwesomeP-GitHubActionsDebianBuildsTrixie
DaAwesomeP Jun 21, 2023
4e0ad13
Merge pull request #1866 from DaAwesomeP/DaAwesomeP-GitHubActionsDebi…
peternewman Jun 21, 2023
6e79847
Merge branch '0.10' into DaAwesomeP-update-readme-status-badge
DaAwesomeP Jun 22, 2023
d4cb022
CONTRIBUTING GitHub CI to GitHub Actions
DaAwesomeP Jun 22, 2023
75fe9d0
README.developer GitHub CI to GitHub Actions
DaAwesomeP Jun 22, 2023
a2847dd
README add gh actions lint badge
DaAwesomeP Jun 22, 2023
e60fd25
Update README link badges to specific builds, update coveralls badge…
DaAwesomeP Jun 22, 2023
a9e7367
Merge pull request #1861 from DaAwesomeP/DaAwesomeP-update-readme-sta…
peternewman Jun 22, 2023
adcc530
master resync 0.10
DaAwesomeP Jun 22, 2023
53dc65e
update package-lock.json for master
DaAwesomeP Jun 22, 2023
b214cd3
Merge remote-tracking branch 'upstream/master'
DaAwesomeP Jun 22, 2023
1a4b0d3
codespell ignore package lock
DaAwesomeP Jun 22, 2023
1666a2d
Merge branch 'DaAwesomeP-CodespellIgnorePackageLock'
DaAwesomeP Jun 22, 2023
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
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