solve conflicts

ioBroker · Aug 24, 2022 · 127e041 · 127e041
2 parents 35f1eaa + dc10033
commit 127e041
Show file tree

Hide file tree

Showing 57 changed files with 1,020 additions and 1,067 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -13,6 +13,11 @@ on:
   schedule:
     - cron: '0 0 * * 0' # weekly
 
+# Cancel previous PR/branch runs when a new commit is pushed
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: Eslint

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "4.1.0-alpha.0-20220804-d8f17893",
+  "version": "4.1.0-alpha.0-20220824-834ccb61",
   "//": "Set up some command options",
   "command": {
     "//": "Running a script should show the output while it is generated",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/js-controller-adapter",
-  "version": "4.1.0-alpha.0-20220804-d8f17893",
+  "version": "4.1.0-alpha.0-20220824-834ccb61",
   "engines": {
     "node": ">=12.0.0"
   },

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/js-controller-cli",
-  "version": "4.1.0-alpha.0-20220804-d8f17893",
+  "version": "4.1.0-alpha.0-20220824-834ccb61",
   "engines": {
     "node": ">=12.0.0"
   },

diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
@@ -5,7 +5,7 @@ module.exports = {
     tools: require('./lib/cli/cliTools'),
     command: {
         object: require('./lib/cli/cliObjects.js'),
-        state: require('./lib/cli/cliStates.js'),
+        state: require('./lib/cli/cliStates.js').CLIStates,
         process: require('./lib/cli/cliProcess.js'),
         message: require('./lib/cli/cliMessage.js'),
         logs: require('./lib/cli/cliLogs.js'),

diff --git a/packages/cli/src/lib/cli/cliCert.js b/packages/cli/src/lib/cli/cliCert.js
@@ -1,5 +1,5 @@
 'use strict';
-const CLICommand = require('./cliCommand.js');
+const { CLICommand } = require('./cliCommand.js');
 const CLIObjects = require('./cliObjects.js');
 const messages = require('./messages.js');
 const { tools } = require('@iobroker/js-controller-common');

diff --git a/packages/cli/src/lib/cli/cliCommand.js b/packages/cli/src/lib/cli/cliCommand.js