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.

Sign up for GitHub

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

Jump to bottom

Master Resync #1868

Merged
merged 28 commits into from
Jun 22, 2023
Merged

Master Resync #1868

merged 28 commits into from
Jun 22, 2023

Conversation

DaAwesomeP
Copy link
Member

For #1801

DaAwesomeP and others added 25 commits June 18, 2023 16:51
@DaAwesomeP
update README build badge, replace some references to Travis with GitHub
7d344e0
@DaAwesomeP
github actions weblint
abffaa1
@DaAwesomeP
github actions weblint install curl
694de97
@DaAwesomeP
github actions weblint create package-lock.json
fff3a85
@DaAwesomeP
github actions weblint job step names
1562f33
@DaAwesomeP
github actions weblint use setup-node
2554fda
@DaAwesomeP @FloEdelmann
github actions weblint cache package-lock
8991ca9 
Co-authored-by: Flo Edelmann <[email protected]>
@DaAwesomeP
github actions remove python2
067ec3d
@DaAwesomeP @FloEdelmann
github actions weblint no container
aa6d62f 
Co-authored-by: Flo Edelmann <[email protected]>
@DaAwesomeP @FloEdelmann
github actions weblint npm dependencies step name
b11591a 
Co-authored-by: Flo Edelmann <[email protected]>
@DaAwesomeP
github actions debian add trixie (new testing)
6ca511f
@peternewman
Merge pull request OpenLightingProject#1863 from DaAwesomeP/DaAwesome…
43e7654 
…P-GitHubActionsWeblint

GitHub Actions Lint: weblint
@peternewman
Merge branch '0.10' into DaAwesomeP-GitHubActionsDebianBuildsTrixie
0e8eb89
@peternewman
Merge branch '0.10' into DaAwesomeP-GitHubActionsRemovePython2
4520224
@peternewman
Merge pull request OpenLightingProject#1865 from DaAwesomeP/DaAwesome…
447f90a 
…P-GitHubActionsRemovePython2

GitHub Actions Remove Python 2
@DaAwesomeP
Merge branch '0.10' into DaAwesomeP-GitHubActionsDebianBuildsTrixie
c3d6102
@peternewman
Merge pull request OpenLightingProject#1866 from DaAwesomeP/DaAwesome…
4e0ad13 
…P-GitHubActionsDebianBuildsTrixie

Github Actions Debian trixie
@DaAwesomeP
Merge branch '0.10' into DaAwesomeP-update-readme-status-badge
6e79847
@DaAwesomeP @peternewman
CONTRIBUTING GitHub CI to GitHub Actions
d4cb022 
Co-authored-by: Peter Newman <[email protected]>
@DaAwesomeP @peternewman
README.developer GitHub CI to GitHub Actions
75fe9d0 
Co-authored-by: Peter Newman <[email protected]>
@DaAwesomeP
README add gh actions lint badge
a2847dd
@DaAwesomeP @peternewman
Update README link badges to specific builds, update coveralls badge …
e60fd25 
…link

Co-authored-by: Peter Newman <[email protected]>
@peternewman
Merge pull request OpenLightingProject#1861 from DaAwesomeP/DaAwesome…
a9e7367 
…P-update-readme-status-badge

Update README build badges and replace some Travis references
@DaAwesomeP
master resync 0.10
adcc530
@DaAwesomeP
update package-lock.json for master
53dc65e
@DaAwesomeP
Copy link
Member Author

@peternewman reminder to add weblint to the required checks.

@DaAwesomeP DaAwesomeP mentioned this pull request Jun 22, 2023
Merged
@DaAwesomeP
Copy link
Member Author

This pull also includes #1869 (pull for 0.10) but for the master branch.

peternewman
peternewman approved these changes Jun 22, 2023
View reviewed changes
Copy link
Member

@peternewman peternewman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks!

@peternewman peternewman added this to the 0.11.0 milestone Jun 22, 2023
@peternewman
Copy link
Member

This pull also includes #1869 (pull for 0.10) but for the master branch.

I'd generally just wait for the next merge if possible, then we can almost merge the resyncs blind as there's no new code in them.

@peternewman
Copy link
Member

@peternewman reminder to add weblint to the required checks.

Done thanks! 👍

@peternewman peternewman merged commit 70a7f7b into OpenLightingProject:master Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peternewman peternewman peternewman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.11.0
Development

Successfully merging this pull request may close these issues.
2 participants
@DaAwesomeP @peternewman