mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-18 00:56:02 +00:00
fixes
This commit is contained in:
@@ -27,7 +27,7 @@ let modified = false;
|
|||||||
|
|
||||||
function conditionMatch(condition, args) {
|
function conditionMatch(condition, args) {
|
||||||
if (_.isString(condition)) {
|
if (_.isString(condition)) {
|
||||||
return args.name == condition;
|
return args.key == condition;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -74,9 +74,13 @@ function processJsonStep(json, args) {
|
|||||||
if (_.isPlainObject(value)) {
|
if (_.isPlainObject(value)) {
|
||||||
if (_.intersection(args.allNames ?? [], Object.keys(value))?.length > 0) {
|
if (_.intersection(args.allNames ?? [], Object.keys(value))?.length > 0) {
|
||||||
modified = true;
|
modified = true;
|
||||||
return value[args.name];
|
return value[args.key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (value?._include) {
|
||||||
|
return includes[value?._include];
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,12 +75,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: 18.x
|
node-version: 18.x
|
||||||
|
|
||||||
- _include:
|
- _include: checkout-dbgate-pro
|
||||||
_name: checkout-dbgate-pro
|
|
||||||
_if: _premium
|
_if: _premium
|
||||||
|
|
||||||
- _include:
|
- _include: merge-dbgate-pro
|
||||||
_name: merge-dbgate-pro
|
|
||||||
_if: _premium
|
_if: _premium
|
||||||
|
|
||||||
- name: adjustPackageJson
|
- name: adjustPackageJson
|
||||||
|
|||||||
Reference in New Issue
Block a user