Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed .github/.DS_Store
Binary file not shown.
26 changes: 19 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
# Dependabot will run on day 7 of each month at 01:45 (Europe/Berlin timezone)
# Dependabot configuration
# Cooldown delays updating normal npm dependencies by 7 days but allows security updates to be processed immediately.
# Note: Cooldown is not supported for the github-actions ecosystem.
# Reference: https://docs.github.com/en/code-security/reference/supply-chain-security/dependabot-options-reference
version: 2
updates:

- package-ecosystem: "npm"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "cron"
timezone: "Europe/Berlin"
cronjob: "45 1 7 * *"
open-pull-requests-limit: 30
versioning-strategy: "increase"
open-pull-requests-limit: 15

- package-ecosystem: "github-actions"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "cron"
timezone: "Europe/Berlin"
cronjob: "45 1 7 * *"
open-pull-requests-limit: 30
open-pull-requests-limit: 15
versioning-strategy: "increase"
ignore:
- dependency-name: "typescript"
update-types:
- "version-update:semver-minor"
- "version-update:semver-major"
- dependency-name: "@types/node"
update-types:
- "version-update:semver-major"
cooldown:
default-days: 7
27 changes: 0 additions & 27 deletions .github/workflows/dependabot-auto-merge.yml.OLD

This file was deleted.

33 changes: 20 additions & 13 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ on:
- "v[0-9]+.[0-9]+.[0-9]+-**"
pull_request: {}

# Cancel previous PR/branch runs when a new commit is pushed
# Cancel previous PR/branch runs when a new commit is pushed.
# Release runs (tag pushes) are never cancelled - cancelling them aborts the deploy job and
# leaves the release half finished, which the ioBroker repo checker reports as W3032.
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') }}

jobs:
# Performs quick checks before the expensive test runs
Expand All @@ -26,22 +28,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: ioBroker/testing-action-check@v1
- uses: ioBroker/testing-action-check@v2
with:
node-version: '20.x'
node-version: '24.x'
# Uncomment the following line if your adapter cannot be installed using 'npm ci'
# install-command: 'npm install'
lint: true

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
needs: [check-and-lint]
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
# Do not cancel the remaining matrix legs when one of them fails,
# otherwise a single flaky OS/node combination hides all other results
fail-fast: false
matrix:
node-version: [20.x, 22.x, 24.x]
os: [ubuntu-latest]
node-version: [22.x, 24.x]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: ioBroker/testing-action-adapter@v1
Expand All @@ -61,10 +68,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Use Node.js 20.x
- name: Use Node.js 24.x
uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 24.x
cache: 'npm'

- name: Install dependencies
Expand All @@ -73,9 +80,9 @@ jobs:
- name: Run demo API tests
run: npm run test:integration-demo

# TODO: To enable automatic npm releases, create a token on npmjs.org
# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
# Then uncomment the following block:
# NOTE: Automatic npm releases are configured via npm Trusted Publishing (OIDC)
# using ioBroker/testing-action-deploy@v1 and the id-token permission below.
# Ensure your npm package is set up for GitHub OIDC; no NPM_TOKEN secret is required.

# Deploys the final package to NPM
deploy:
Expand All @@ -97,7 +104,7 @@ jobs:
steps:
- uses: ioBroker/testing-action-deploy@v1
with:
node-version: '20.x'
node-version: '24.x'
# Uncomment the following line if your adapter cannot be installed using 'npm ci'
# install-command: 'npm install'
# npm-token: ${{ secrets.NPM_TOKEN }} # Commented out for migration to Trusted Publishing
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ iobroker.*.tgz
.code-workspace

Thumbs.db
.DS_Store

# i18n intermediate files
admin/i18n/flat.txt
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ It uses the Discovergy API to read data of your meters and synchronise it's curr

https://api.discovergy.com/docs/

## Sentry
**This adapter uses Sentry libraries to automatically report exceptions and code errors to the developers.** For more details and for information how to disable the error reporting see [Sentry-Plugin Documentation](https://github.com/ioBroker/plugin-sentry#plugin-sentry)! Sentry reporting is used starting with js-controller 3.0.

Please feel free to add issue for your wanted functionality or problems you see so i can take a look at it !

Remark : I don't have all possible devices and also the demo-account does not provide all existing values devices can provide.
Expand Down Expand Up @@ -38,6 +41,7 @@ If you like my work, please feel free to provide a personal donation
### __WORK IN PROGRESS__
-->
### __WORK IN PROGRESS__
* (DutchmanNL) Maintenance: raise Node.js to 22, modernise CI and release tooling, update dependencies, resolve repository checker findings
* (DutchmanNL) **FIXED**: Removed non-existent version 0.6.1 from changelog to comply with ioBroker repository checker requirements (E2004)
* (DutchmanNL) **ENHANCED**: Cleaned up common.news entries in io-package.json to maintain only published versions

Expand All @@ -54,6 +58,8 @@ If you like my work, please feel free to provide a personal donation
### 0.5.12 (2023-10-29)
* (DutchmanNL) Ignore meters not providing any data (like removed devices) fixes #84

[Older changelogs can be found there](CHANGELOG_OLD.md)

## Contributors
* AlCalzone
* zoernert
Expand Down
Binary file removed admin/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"Password": "Password",
"Seconds between data polling": "Seconds between data polling",
"Username": "Username",
"Your Discovergy Username": "Your Discovergy Username",
"discovergy adapter settings": "Adapter settings for discovergy",
Expand Down
Loading
Loading