@catladder/cli 0.0.0-main-88659890 → 0.0.0-main-4dd17ee1

package/dist/bundles/catenv/index.js

@@ -39370,7 +39370,7 @@ var cache_1 = __nccwpck_require__(4303);
 var constants_2 = __nccwpck_require__(9284);
 var yarn_1 = __nccwpck_require__(464);
 var createNodeBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   var buildConfig = context.componentConfig.build;
   if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
     throw new Error("deploy config is not node, node-static or storybook");
@@ -39378,13 +39378,14 @@ var createNodeBuildJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
-    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+    cache: __spreadArray(__spreadArray(__spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _a !== void 0 ? _a : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
+    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_b = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _b !== void 0 ? _b : []), false),
     artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_d = (_c = buildConfig.artifactsPaths) === null || _c === void 0 ? void 0 : _c.map(function (path) {
         return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _c !== void 0 ? _c : []), false)
-    }
+      })) !== null && _d !== void 0 ? _d : []), false)
+    },
+    jobTags: buildConfig.jobTags
   }) : null;
   return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
@@ -39392,9 +39393,9 @@ var createNodeBuildJobs = function (context) {
     variables: {
       // only required for non static
       DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
+      DOCKER_COPY_WORKSPACE_FILES: (_f = (_e = context.packageManagerInfo) === null || _e === void 0 ? void 0 : _e.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _e === void 0 ? void 0 : _e.join("\n")
+      })) === null || _f === void 0 ? void 0 : _f.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
   })] : []), false);
@@ -39806,7 +39807,7 @@ var getYarnInstallCommand = function (context) {
   return "yarn install --immutable";
 };
 var ensureNodeVersion = function (context) {
-  return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi"];
+  return ["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if [ -f ./.nvmrc ]; then nvm install <<< .nvmrc; fi"];
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context) {
@@ -40231,7 +40232,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-88659890" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-4dd17ee1" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -40664,7 +40665,10 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
           basePredefinedVariables = {
             ENV_SHORT: env,
             APP_DIR: envConfigRaw.dir,
-            ENV_TYPE: envType
+            ENV_TYPE: envType,
+            BUILD_INFO_ID: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.buildId,
+            BUILD_INFO_BUILD_TIME: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.buildTime,
+            BUILD_INFO_CURRENT_VERSION: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.currentVersion
           };
           if (envType === "local") {
             devLocalConfig = envConfigRaw;
@@ -41281,10 +41285,10 @@ var DEPLOY_RUNNER_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
   KUBERNETES_MEMORY_REQUEST: "200Mi",
-  KUBERNETES_MEMORY_LIMIT: "500Mi"
+  KUBERNETES_MEMORY_LIMIT: "200Mi"
 };
 var getBaseDeploymentJob = function (context) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
   var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
@@ -41320,11 +41324,12 @@ var getBaseDeploymentJob = function (context) {
     }],
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
-    variables: __assign(__assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}),
+    variables: __assign(__assign(__assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}),
     environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
       on_stop: exports.STOP_JOB_NAME,
       auto_stop_in: autoStop
-    } : {})
+    } : {}),
+    jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
   };
 };
 exports.getBaseDeploymentJob = getBaseDeploymentJob;
@@ -43025,7 +43030,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 exports.__esModule = true;
-exports.getBuildId = void 0;
+exports.getCurrentVersionString = exports.getBuildId = void 0;
 var child_process_promise_1 = __nccwpck_require__(5763);
 var getBuildId = function () {
   return __awaiter(void 0, void 0, void 0, function () {
@@ -43042,6 +43047,26 @@ var getBuildId = function () {
   });
 };
 exports.getBuildId = getBuildId;
+// thx chat gpt
+/**
+ * returns the last tagged version string Major.minor.patch
+ * returns 0.0.0 if there is no tag
+ */
+var getCurrentVersionString = function () {
+  return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          return [4 /*yield*/, (0, child_process_promise_1.exec)('latest_tag=$(git describe --tags --abbrev=0 2>/dev/null); if [ -z "$latest_tag" ]; then echo "0.0.0"; else echo "${latest_tag#v}"; fi | cut -d "." -f 1-3').then(function (s) {
+            return s.stdout.trim();
+          })];
+        case 1:
+          return [2 /*return*/, _a.sent()];
+      }
+    });
+  });
+};
+exports.getCurrentVersionString = getCurrentVersionString;
 
 /***/ }),
 
@@ -43183,7 +43208,10 @@ var getBaseCommitInfo = function () {
           };
           return [4 /*yield*/, (0, getBuildId_1.getBuildId)()];
         case 1:
-          return [2 /*return*/, (_a.buildId = _c.sent(), _a)];
+          _a.buildId = _c.sent();
+          return [4 /*yield*/, (0, getBuildId_1.getCurrentVersionString)()];
+        case 2:
+          return [2 /*return*/, (_a.currentVersion = _c.sent(), _a)];
       }
     });
   });
@@ -43968,6 +43996,13 @@ exports.__esModule = true;
 exports.createGitlabJobs = exports.makeGitlabJob = void 0;
 var lodash_1 = __nccwpck_require__(3255);
 var defaults_1 = __nccwpck_require__(7383);
+var removeUndefined = function (obj) {
+  return Object.fromEntries(Object.entries(obj).filter(function (_a) {
+    var _b = __read(_a, 2),
+      value = _b[1];
+    return value !== undefined;
+  }));
+};
 var getFullJobName = function (name, componentName, env) {
   if (env) {
     return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
@@ -43995,7 +44030,8 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     needsOtherComponent = _a.needsOtherComponent,
     name = _a.name,
     needs = _a.needs,
-    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
+    jobTags = _a.jobTags,
+    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags"]);
   var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
   var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
     var _a, _b, _c, _d;
@@ -44025,7 +44061,8 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     return getJobName(a).localeCompare(getJobName(b));
   });
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
-  var gitlabJob = __assign(__assign({}, job), {
+  var gitlabJob = removeUndefined(__assign(__assign({}, job), {
+    tags: jobTags,
     stage: stage,
     environment: ((_b = job.environment) === null || _b === void 0 ? void 0 : _b.on_stop) ? __assign(__assign({}, job.environment), {
       on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allJobs)
@@ -44034,7 +44071,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     needs: gitlabNeeds,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
-  });
+  }));
   return [fullJobName, gitlabJob];
 };
 exports.makeGitlabJob = makeGitlabJob;

package/dist/bundles/cli/index.js

@@ -350673,7 +350673,7 @@ var cache_1 = __nccwpck_require__(54303);
 var constants_2 = __nccwpck_require__(69284);
 var yarn_1 = __nccwpck_require__(10464);
 var createNodeBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   var buildConfig = context.componentConfig.build;
   if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
     throw new Error("deploy config is not node, node-static or storybook");
@@ -350681,13 +350681,14 @@ var createNodeBuildJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
-    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+    cache: __spreadArray(__spreadArray(__spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _a !== void 0 ? _a : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
+    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_b = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _b !== void 0 ? _b : []), false),
     artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_d = (_c = buildConfig.artifactsPaths) === null || _c === void 0 ? void 0 : _c.map(function (path) {
         return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _c !== void 0 ? _c : []), false)
-    }
+      })) !== null && _d !== void 0 ? _d : []), false)
+    },
+    jobTags: buildConfig.jobTags
   }) : null;
   return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
@@ -350695,9 +350696,9 @@ var createNodeBuildJobs = function (context) {
     variables: {
       // only required for non static
       DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
+      DOCKER_COPY_WORKSPACE_FILES: (_f = (_e = context.packageManagerInfo) === null || _e === void 0 ? void 0 : _e.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _e === void 0 ? void 0 : _e.join("\n")
+      })) === null || _f === void 0 ? void 0 : _f.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
   })] : []), false);
@@ -351109,7 +351110,7 @@ var getYarnInstallCommand = function (context) {
   return "yarn install --immutable";
 };
 var ensureNodeVersion = function (context) {
-  return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi"];
+  return ["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if [ -f ./.nvmrc ]; then nvm install <<< .nvmrc; fi"];
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context) {
@@ -351534,7 +351535,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-88659890" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-4dd17ee1" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -351967,7 +351968,10 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
           basePredefinedVariables = {
             ENV_SHORT: env,
             APP_DIR: envConfigRaw.dir,
-            ENV_TYPE: envType
+            ENV_TYPE: envType,
+            BUILD_INFO_ID: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.buildId,
+            BUILD_INFO_BUILD_TIME: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.buildTime,
+            BUILD_INFO_CURRENT_VERSION: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.currentVersion
           };
           if (envType === "local") {
             devLocalConfig = envConfigRaw;
@@ -352584,10 +352588,10 @@ var DEPLOY_RUNNER_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
   KUBERNETES_MEMORY_REQUEST: "200Mi",
-  KUBERNETES_MEMORY_LIMIT: "500Mi"
+  KUBERNETES_MEMORY_LIMIT: "200Mi"
 };
 var getBaseDeploymentJob = function (context) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
   var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
@@ -352623,11 +352627,12 @@ var getBaseDeploymentJob = function (context) {
     }],
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
-    variables: __assign(__assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}),
+    variables: __assign(__assign(__assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}),
     environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
       on_stop: exports.STOP_JOB_NAME,
       auto_stop_in: autoStop
-    } : {})
+    } : {}),
+    jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
   };
 };
 exports.getBaseDeploymentJob = getBaseDeploymentJob;
@@ -354328,7 +354333,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 exports.__esModule = true;
-exports.getBuildId = void 0;
+exports.getCurrentVersionString = exports.getBuildId = void 0;
 var child_process_promise_1 = __nccwpck_require__(75763);
 var getBuildId = function () {
   return __awaiter(void 0, void 0, void 0, function () {
@@ -354345,6 +354350,26 @@ var getBuildId = function () {
   });
 };
 exports.getBuildId = getBuildId;
+// thx chat gpt
+/**
+ * returns the last tagged version string Major.minor.patch
+ * returns 0.0.0 if there is no tag
+ */
+var getCurrentVersionString = function () {
+  return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          return [4 /*yield*/, (0, child_process_promise_1.exec)('latest_tag=$(git describe --tags --abbrev=0 2>/dev/null); if [ -z "$latest_tag" ]; then echo "0.0.0"; else echo "${latest_tag#v}"; fi | cut -d "." -f 1-3').then(function (s) {
+            return s.stdout.trim();
+          })];
+        case 1:
+          return [2 /*return*/, _a.sent()];
+      }
+    });
+  });
+};
+exports.getCurrentVersionString = getCurrentVersionString;
 
 /***/ }),
 
@@ -354486,7 +354511,10 @@ var getBaseCommitInfo = function () {
           };
           return [4 /*yield*/, (0, getBuildId_1.getBuildId)()];
         case 1:
-          return [2 /*return*/, (_a.buildId = _c.sent(), _a)];
+          _a.buildId = _c.sent();
+          return [4 /*yield*/, (0, getBuildId_1.getCurrentVersionString)()];
+        case 2:
+          return [2 /*return*/, (_a.currentVersion = _c.sent(), _a)];
       }
     });
   });
@@ -355271,6 +355299,13 @@ exports.__esModule = true;
 exports.createGitlabJobs = exports.makeGitlabJob = void 0;
 var lodash_1 = __nccwpck_require__(23255);
 var defaults_1 = __nccwpck_require__(87383);
+var removeUndefined = function (obj) {
+  return Object.fromEntries(Object.entries(obj).filter(function (_a) {
+    var _b = __read(_a, 2),
+      value = _b[1];
+    return value !== undefined;
+  }));
+};
 var getFullJobName = function (name, componentName, env) {
   if (env) {
     return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
@@ -355298,7 +355333,8 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     needsOtherComponent = _a.needsOtherComponent,
     name = _a.name,
     needs = _a.needs,
-    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
+    jobTags = _a.jobTags,
+    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags"]);
   var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
   var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
     var _a, _b, _c, _d;
@@ -355328,7 +355364,8 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     return getJobName(a).localeCompare(getJobName(b));
   });
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
-  var gitlabJob = __assign(__assign({}, job), {
+  var gitlabJob = removeUndefined(__assign(__assign({}, job), {
+    tags: jobTags,
     stage: stage,
     environment: ((_b = job.environment) === null || _b === void 0 ? void 0 : _b.on_stop) ? __assign(__assign({}, job.environment), {
       on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allJobs)
@@ -355337,7 +355374,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     needs: gitlabNeeds,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
-  });
+  }));
   return [fullJobName, gitlabJob];
 };
 exports.makeGitlabJob = makeGitlabJob;