Skip to content

Commit 26dee8d

Browse files
authored
Merge branch 'main' into update-from-template-X0000-MigrateToTrustedPublishing-1760786195
2 parents 665e217 + 49c0b09 commit 26dee8d

File tree

14 files changed

+2258
-1688
lines changed

14 files changed

+2258
-1688
lines changed

.github/dependabot.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1+
# Dependabot will run on day 25 of each month at 01:03 (Europe/Berlin timezone)
12
version: 2
23
updates:
3-
- package-ecosystem: npm
4+
5+
- package-ecosystem: "npm"
46
directory: "/"
57
schedule:
6-
interval: daily
8+
interval: "daily"
79
time: "04:00"
8-
timezone: Europe/Berlin
9-
open-pull-requests-limit: 10
10+
timezone: "Europe/Berlin"
11+
open-pull-requests-limit: 15
1012
assignees:
11-
- ThomasPohl
12-
versioning-strategy: increase
13+
- "ThomasPohl"
14+
versioning-strategy: "increase"
1315

14-
- package-ecosystem: github-actions
16+
- package-ecosystem: "github-actions"
1517
directory: "/"
1618
schedule:
17-
interval: monthly
18-
time: "04:00"
19-
timezone: Europe/Berlin
20-
open-pull-requests-limit: 10
19+
interval: "cron"
20+
timezone: "Europe/Berlin"
21+
cronjob: "3 1 25 * *"
22+
open-pull-requests-limit: 15
2123
assignees:
22-
- ThomasPohl
24+
- "ThomasPohl"

.github/workflows/dependabot-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818

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

.github/workflows/test-and-release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ${{ matrix.os }}
4242
strategy:
4343
matrix:
44-
node-version: [20.x, 22.x]
44+
node-version: [20.x, 22.x, 24.x]
4545
os: [ubuntu-latest, windows-latest, macos-latest]
4646

4747
steps:
@@ -81,7 +81,6 @@ jobs:
8181
# Uncomment the following line if your adapter cannot be installed using 'npm ci'
8282
# install-command: 'npm install'
8383
build: true
84-
# npm-token: ${{ secrets.NPM_TOKEN }} # Commented out for migration to Trusted Publishing
8584
github-token: ${{ secrets.GITHUB_TOKEN }}
8685

8786
# When using Sentry for error reporting, Sentry can be informed about new releases

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ Thumbs.db
1414

1515
# i18n intermediate files
1616
admin/i18n/flat.txt
17-
admin/i18n/*/flat.txt
17+
admin/i18n/*/flat.txt
18+
#ignore .commitinfo created by ioBroker release script
19+
.commitinfo

.vscode/settings.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
"fileMatch": [
1313
"admin/jsonConfig.json",
1414
"admin/jsonCustom.json",
15-
"admin/jsonTab.json"
15+
"admin/jsonTab.json",
16+
"admin/jsonConfig.json5",
17+
"admin/jsonCustom.json5",
18+
"admin/jsonTab.json5"
1619
],
17-
"url": "https://raw.githubusercontent.com/ioBroker/adapter-react-v5/main/schemas/jsonConfig.json"
20+
"url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json"
1821
}
1922
]
20-
}
23+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Make sure the Service Account has adequate permissions to write to the spreadshe
133133

134134
## License
135135

136-
Copyright (c) 2024 Thomas Pohl
136+
Copyright (c) 2024-2025 Thomas Pohl
137137

138138
Licensed under the Apache License, Version 2.0 (the "License");
139139
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)