Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
GermanBluefox committed Apr 12, 2024
2 parents 6258cdb + 8e48114 commit 2822b5d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{ matrix.language }}"
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,19 @@
"SCADA"
],
"dependencies": {
"@iobroker/adapter-core": "^3.0.4"
"@iobroker/adapter-core": "^3.0.6"
},
"devDependencies": {
"@alcalzone/release-script": "^3.7.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.0",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/legacy-testing": "^1.0.5",
"@iobroker/vis-2-widgets-testing": "^1.0.0",
"chai": "^4.3.10",
"colorette": "^2.0.20",
"@iobroker/legacy-testing": "^1.0.9",
"gulp": "^4.0.2",
"gulp-replace": "^1.1.4",
"iobroker.web": "*",
"mocha": "^10.2.0",
"puppeteer": "^21.6.1"
"puppeteer": "^21.6.1",
"mocha": "^10.4.0",
"chai": "^4.3.10"
},
"bugs": {
"url": "https://github.com/iobroker/iobroker.vis/issues"
Expand Down

0 comments on commit 2822b5d

Please sign in to comment.