From 42a4ecc676f1d60d53bc66200822fea0de6c9bd6 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 21 Feb 2022 17:13:07 +0700
Subject: [PATCH] Fix build with skillset (#1037)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 common/config/rush/pnpm-lock.yaml | 19 ++++++++-----------
 models/tags/package.json          |  2 +-
 server/front/build.sh             |  2 +-
 server/server/build.sh            |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 499f9cd35e..bb0166cfcb 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1,7 +1,7 @@
 lockfileVersion: 5.3
 
 specifiers:
-  '@anticrm/skillset': https://github.com/hcengineering/skillset.git
+  '@anticrm/skillset': ^0.6.0
   '@elastic/elasticsearch': ^7.14.0
   '@koa/cors': ^3.1.0
   '@microsoft/api-extractor': ^7.18.4
@@ -211,7 +211,7 @@ specifiers:
   xml2js: ~0.4.23
 
 dependencies:
-  '@anticrm/skillset': github.com/hcengineering/skillset/7c97534c09c7382546f10d16ae27721a5704018f
+  '@anticrm/skillset': 0.6.0
   '@elastic/elasticsearch': 7.16.0
   '@koa/cors': 3.1.0
   '@microsoft/api-extractor': 7.19.2
@@ -422,6 +422,10 @@ dependencies:
 
 packages:
 
+  /@anticrm/skillset/0.6.0:
+    resolution: {integrity: sha512-k5/57q9ie73oCFKAxZrKy/BSnakiaVZsJmfjzmqhoko+3dZq2M2o/h1r+RSZrQ6re51iMqFdsVZAtfdPL15hjA==}
+    dev: false
+
   /@babel/code-frame/7.12.11:
     resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==}
     dependencies:
@@ -12599,12 +12603,12 @@ packages:
     dev: false
 
   file:projects/model-tags.tgz_typescript@4.5.4:
-    resolution: {integrity: sha512-ydbpF6SS1lFreF2Dyb7mHeKUD5ajzVa/KhOSiAMiVCU9zwy7aoFfUE3Uy+98biYE+qv/6jsF9x93o3r5WfYEfg==, tarball: file:projects/model-tags.tgz}
+    resolution: {integrity: sha512-M9oDcJc4rUtXqhC4FcPW+Z62RTGfstzLFi6DnorfVhtEANY/2VTUPiyjwLM+ml6sCHVdG49kaAx1gLHyEbAF7Q==, tarball: file:projects/model-tags.tgz}
     id: file:projects/model-tags.tgz
     name: '@rush-temp/model-tags'
     version: 0.0.0
     dependencies:
-      '@anticrm/skillset': github.com/hcengineering/skillset/7c97534c09c7382546f10d16ae27721a5704018f
+      '@anticrm/skillset': 0.6.0
       '@rushstack/heft': 0.41.8
       '@types/heft-jest': 1.0.2
       '@typescript-eslint/eslint-plugin': 5.7.0_c25e8c1f4f4f7aaed27aa6f9ce042237
@@ -14169,10 +14173,3 @@ packages:
     transitivePeerDependencies:
       - supports-color
     dev: false
-
-  github.com/hcengineering/skillset/7c97534c09c7382546f10d16ae27721a5704018f:
-    resolution: {tarball: https://codeload.github.com/hcengineering/skillset/tar.gz/7c97534c09c7382546f10d16ae27721a5704018f}
-    name: '@anticrm/skillset'
-    version: 0.6.0
-    requiresBuild: true
-    dev: false
diff --git a/models/tags/package.json b/models/tags/package.json
index 78fad0c538..407b2403c9 100644
--- a/models/tags/package.json
+++ b/models/tags/package.json
@@ -34,6 +34,6 @@
     "@anticrm/ui": "~0.6.0",
     "@anticrm/model-core": "~0.6.0",
     "@anticrm/model-view": "~0.6.0",
-    "@anticrm/skillset": "https://github.com/hcengineering/skillset.git"
+    "@anticrm/skillset": "^0.6.0"
   }
 }
diff --git a/server/front/build.sh b/server/front/build.sh
index 0301e46926..b692181049 100755
--- a/server/front/build.sh
+++ b/server/front/build.sh
@@ -16,5 +16,5 @@
 #
 
 rushx bundle
-rushx docker:build
+rushx docker:build $@
 rushx docker:push
diff --git a/server/server/build.sh b/server/server/build.sh
index 0301e46926..b692181049 100755
--- a/server/server/build.sh
+++ b/server/server/build.sh
@@ -16,5 +16,5 @@
 #
 
 rushx bundle
-rushx docker:build
+rushx docker:build $@
 rushx docker:push