Merge branch 'master' into snyk-upgrade-d95ae2967708f37cdad5eb667aebcfea

ka-vaNu · Oct 29, 2023 · f7b2a15 · f7b2a15
2 parents 9cc3bba + 203842c
commit f7b2a15
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch: {}
   push:
     branches:
-      - "main"
+      - "master"
     tags:
       # normal versions
       - "v[0-9]+.[0-9]+.[0-9]+"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.3",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "dot-object": "^2.1.4",
     "node-schedule": "^2.1.1"
   },
@@ -40,7 +40,7 @@
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.46.0",