Skip to content

Commit

Permalink
Merge branch 'klein0r:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Jarves020 authored Jan 8, 2022
2 parents a02a303 + 140bf44 commit d4a1efc
Show file tree
Hide file tree
Showing 42 changed files with 6,203 additions and 4,595 deletions.
45 changes: 45 additions & 0 deletions .create-adapter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"cli": true,
"target": "directory",
"adapterName": "lametric",
"title": "LaMetric Time",
"description": "Control and manage your LaMetric Time",
"keywords": [
"lametric",
"hardware",
"clock",
"message",
"notification"
],
"expert": "yes",
"features": [
"adapter"
],
"adminFeatures": [],
"type": "hardware",
"startMode": "daemon",
"connectionType": "local",
"dataSource": "poll",
"connectionIndicator": "yes",
"language": "JavaScript",
"adminReact": "no",
"tools": [
"ESLint",
"type checking"
],
"releaseScript": "yes",
"devServer": "yes",
"devServerPort": 8081,
"indentation": "Space (4)",
"quotes": "single",
"es6class": "yes",
"authorName": "Matthias Kleine",
"authorGithub": "klein0r",
"authorEmail": "[email protected]",
"gitRemoteProtocol": "SSH",
"gitCommit": "no",
"defaultBranch": "master",
"license": "MIT License",
"dependabot": "no",
"creatorVersion": "2.0.1"
}
21 changes: 18 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
{
"root": true,
"env": {
"es6": true,
"node": true,
"mocha": true
},
"extends": "eslint:recommended",
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"plugins": [
"react"
],
"settings": {
"react": {
"version": "detect"
}
},
"rules": {
"indent": [
"error",
Expand All @@ -15,8 +27,8 @@
],
"no-console": "off",
"no-var": "error",
"prefer-const": "error",
"no-trailing-spaces": "error",
"prefer-const": "error",
"quotes": [
"error",
"single",
Expand All @@ -31,6 +43,9 @@
]
},
"parserOptions": {
"ecmaVersion": 2018
"ecmaVersion": 2018,
"ecmaFeatures": {
"jsx": true
}
}
}
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

79 changes: 79 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Bug report
title: "Bug report"
description: "Create a report to help improve this ioBroker adapter"
labels: bug
body:
- type: markdown
attributes:
value: >
**Thank you for wanting to report a bug in this adapter!**
If this is the first time you are doing this, please take a few moments to read
through the [README](https://github.com/klein0r/ioBroker.lametric/blob/master/README.md).
You are about to report a bug in **LaMetric Adapter**. Do not proceed if your issues
occurs with ioBroker, any third party adapters, unofficial or outdated
adapter versions.
Do also not seek support here ("I need help with ...", "I have a
question ...", "Can someone walk me through ..."), that belongs into the
[ioBroker forum at forum.iobroker.net](https://forum.iobroker.net/).
And finally, make sure any bug you want to report is still present with the **current**
adapter (beta) version.
Thank you for your collaboration!
- type: textarea
attributes:
label: The problem
description: >-
Describe the issue you are experiencing here. Tell us what you were trying to do
step by step, and what happened that you did not expect.
Provide a clear and concise description of what the problem is and include as many
details as possible.
validations:
required: true
- type: markdown
attributes:
value: |
## Environment
- type: input
attributes:
label: Version of nodejs
description: Can be found in the host section of ioBroker admin
validations:
required: true
- type: input
attributes:
label: Version of ioBroker js-controller
description: Can be found in the host section of ioBroker admin
validations:
required: true
- type: input
attributes:
label: Version of Adapter
description: Can be found in the adapters tab of ioBroker admin
validations:
required: true
- type: input
attributes:
label: Operating system running ioBroker
description: >-
Linux, Windows, MacOS, something else? With version please?
validations:
required: true
- type: markdown
attributes:
value: |
## Logs and other files needed for analysis
- type: checkboxes
attributes:
label: Checklist of files to include below
options:
- label: iobroker.current.log (Please share the logs in debug mode)
required: true
- label: Contents of the JavaScript browser console (always include in cases of issues with the user interface)
- type: textarea
attributes:
label: Additional information & file uploads
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
30 changes: 0 additions & 30 deletions .github/workflows/npmpublish.yml

This file was deleted.

69 changes: 69 additions & 0 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Test and Release

# Run this job on all pushes and pull requests
# as well as tags with a semantic version
on:
push:
branches:
- "*"
tags:
# normal versions
- "v[0-9]+.[0-9]+.[0-9]+"
# pre-releases
- "v[0-9]+.[0-9]+.[0-9]+-**"
pull_request: {}

jobs:
# Performs quick checks before the expensive test runs
check-and-lint:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ubuntu-latest

steps:
- uses: ioBroker/testing-action-check@v1
with:
node-version: '14.x'
lint: true

adapter-tests:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [12.x, 14.x, 16.x]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: ioBroker/testing-action-adapter@v1
with:
node-version: ${{ matrix.node-version }}
os: ${{ matrix.os }}

deploy:
needs: [check-and-lint, adapter-tests]

if: |
contains(github.event.head_commit.message, '[skip ci]') == false &&
github.event_name == 'push' &&
startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-latest

steps:
- uses: ioBroker/testing-action-deploy@v1
with:
node-version: '14.x'
npm-token: ${{ secrets.NPM_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}

# When using Sentry for error reporting, Sentry can be informed about new releases
# To enable create a API-Token in Sentry (User settings, API keys)
# Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options
# Then uncomment and customize the following block:
sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }}
sentry-project: "iobroker-lametric"
sentry-version-prefix: "iobroker.lametric"
# If your sentry project is linked to a GitHub repository, you can enable the following option
# sentry-github-integration: true
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ Thumbs.db

# i18n intermediate files
admin/i18n/flat.txt
admin/i18n/*/flat.txt
admin/i18n/*/flat.txt

# ioBroker dev-server
.dev-server/
27 changes: 0 additions & 27 deletions .npmignore

This file was deleted.

1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
3 changes: 3 additions & 0 deletions .releaseconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": ["iobroker", "license"]
}
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Matthias Kleine <[email protected]>
Copyright (c) 2021 Matthias Kleine <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit d4a1efc

Please sign in to comment.