Skip to content

Commit 9098f37

Browse files
Merge branch 'master' into upd-adapter-core
2 parents 331ebb0 + b689004 commit 9098f37

File tree

325 files changed

+20577
-20744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+20577
-20744
lines changed

.github/dependabot.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1+
# Dependabot will run on day 14 of each month at 03:59 (Europe/Berlin timezone)
12
version: 2
23
updates:
3-
# Maintain dependencies for GitHub Actions
4-
- package-ecosystem: github-actions
4+
5+
- package-ecosystem: "github-actions"
56
directory: "/"
67
schedule:
7-
interval: monthly
8-
time: "04:00"
9-
timezone: Europe/Berlin
8+
interval: "cron"
9+
timezone: "Europe/Berlin"
10+
cronjob: "59 3 14 * *"
11+
open-pull-requests-limit: 15
1012

11-
- package-ecosystem: npm
12-
directory: "/"
13+
- package-ecosystem: "npm"
1314
schedule:
14-
interval: monthly
15-
time: "04:00"
16-
timezone: Europe/Berlin
17-
open-pull-requests-limit: 5
18-
versioning-strategy: increase
15+
interval: "cron"
16+
timezone: "Europe/Berlin"
17+
cronjob: "59 3 14 * *"
18+
open-pull-requests-limit: 15
19+
versioning-strategy: "increase"
20+
directories:
21+
- "**/*"

.github/workflows/ci-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
runs-on: ubuntu-22.04
2424

2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
- name: Use Node.js
28-
uses: actions/setup-node@v5
28+
uses: actions/setup-node@v6
2929
with:
3030
node-version-file: '.nvmrc'
3131

@@ -45,9 +45,9 @@ jobs:
4545
node: [18, 20, 22, 24]
4646

4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
- name: Use Node.js ${{ matrix.node }}
50-
uses: actions/setup-node@v5
50+
uses: actions/setup-node@v6
5151
with:
5252
node-version: ${{ matrix.node }}
5353

@@ -120,11 +120,11 @@ jobs:
120120

121121
- name: Checkout repository
122122
if: steps.automerge.outputs.mergeResult == 'merged'
123-
uses: actions/checkout@v5
123+
uses: actions/checkout@v6
124124

125125
- name: Use Node.js
126126
if: steps.automerge.outputs.mergeResult == 'merged'
127-
uses: actions/setup-node@v5
127+
uses: actions/setup-node@v6
128128
with:
129129
node-version-file: '.nvmrc'
130130

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v3
30+
uses: github/codeql-action/init@v4
3131
with:
3232
languages: ${{ matrix.language }}
3333
queries: +security-and-quality
3434

3535
- name: Autobuild
36-
uses: github/codeql-action/autobuild@v3
36+
uses: github/codeql-action/autobuild@v4
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@v3
39+
uses: github/codeql-action/analyze@v4
4040
with:
4141
category: "/language:${{ matrix.language }}"

.github/workflows/dependabot-automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Check if PR should be auto-merged
1717
uses: ahmadnassri/action-dependabot-auto-merge@v2

.github/workflows/nightly-dev-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626
with:
2727
fetch-depth: 0 # Fetch the history, or this action won't work
2828

2929
- name: Use Node.js
30-
uses: actions/setup-node@v5
30+
uses: actions/setup-node@v6
3131
with:
3232
node-version-file: '.nvmrc'
3333

.github/workflows/official-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0 # Fetch the history, or this action won't work
2525

2626
- name: Use Node.js
27-
uses: actions/setup-node@v5
27+
uses: actions/setup-node@v6
2828
with:
2929
node-version-file: '.nvmrc'
3030

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ ioBroker
3232
build
3333
lerna-debug.log
3434
.nx
35+
36+
#ignore .commitinfo created by ioBroker release script
37+
.commitinfo

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* (@copilot) Fixed adminUI, adminTab, and adminColumns configurations being incorrectly preserved during adapter uploads
99
* (@foxriver76) Added objects warn limit per instance
1010
* (@Apollon77) Allows only numbers for `ts` and `lc` fields in state when provided for setState
11+
* (@Apollon77) Respect the adapter specific stopTimeout in all cases instead a fallback os 4s
1112
* (@GermanBluefox) Added typing for `visIconSets` in `io-package.json`(for vis-2 SVG icon sets)
1213
* (@GermanBluefox) Added typing for `smartName` in the enum objects
1314
* (@GermanBluefox) Added typing for `supportsLoadingMessage` in the instance objects

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "7.0.8-alpha.7-20250928-40cb80c18",
2+
"version": "7.0.8-alpha.8-20251127-036be0224",
33
"command": {
44
"run": {
55
"stream": true

0 commit comments

Comments
 (0)