From bd0404fbaf62d473f237525eeaf9e1941e549e1b Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 28 Dec 2024 15:36:05 +0100
Subject: [PATCH] fixes

---
 common/processWorkflows.js               | 8 ++++++--
 workflow-templates/build-docker.tpl.yaml | 6 ++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/processWorkflows.js b/common/processWorkflows.js
index c076b4c05..407b7bae5 100644
--- a/common/processWorkflows.js
+++ b/common/processWorkflows.js
@@ -27,7 +27,7 @@ let modified = false;
 
 function conditionMatch(condition, args) {
   if (_.isString(condition)) {
-    return args.name == condition;
+    return args.key == condition;
   }
   return false;
 }
@@ -74,9 +74,13 @@ function processJsonStep(json, args) {
     if (_.isPlainObject(value)) {
       if (_.intersection(args.allNames ?? [], Object.keys(value))?.length > 0) {
         modified = true;
-        return value[args.name];
+        return value[args.key];
       }
     }
+
+    if (value?._include) {
+      return includes[value?._include];
+    }
   });
 }
 
diff --git a/workflow-templates/build-docker.tpl.yaml b/workflow-templates/build-docker.tpl.yaml
index 54fd3fea2..be5080d10 100644
--- a/workflow-templates/build-docker.tpl.yaml
+++ b/workflow-templates/build-docker.tpl.yaml
@@ -75,12 +75,10 @@ jobs:
         with:
           node-version: 18.x
 
-      - _include: 
-          _name: checkout-dbgate-pro
+      - _include: checkout-dbgate-pro 
         _if: _premium
 
-      - _include: 
-          _name: merge-dbgate-pro
+      - _include: merge-dbgate-pro 
         _if: _premium
 
       - name: adjustPackageJson