@soft-artel/ci 2.3.85 → 2.3.87

package/.gitlab-ci.yml

@@ -6,7 +6,7 @@ public_sa-ci:
  only:
    - release
  script:
-  - 'npm publish'
-  - 'npm update -g sa-ci'
+  - 'sh ./_publish.sh'
+  - 'npm update -g @soft-artel/ci'
  tags:
   - ansible

package/_publish.sh

@@ -1,25 +1,11 @@
 #!/bin/bash
-echo "Current: v$(cat ./package.json | grep version | grep -o '[0-9\.]\+')"
+echo "Publishing v$(cat ./package.json | grep version | grep -o '[0-9\.]\+')"
 
-rm -rf _publish
-node upd_pkg.js
-
-tsc -p tsconfig.json
-cp package.json _publish/
+rm -rf _dist
+npm i --production
+npm run build
 
 echo "Build succseed!"
 
-cd _publish
-PUBLISH_VERSION=$(cat ./package.json | grep version | grep -o '[0-9\.]\+')
-echo "New version: v${PUBLISH_VERSION}"
-
-npm version $PUBLISH_VERSION
+cd _dist
 npm publish
-echo "v${PUBLISH_VERSION} published!"
-
-cd .. 
-git commit -a -m "v${PUBLISH_VERSION} published!"
-git push
-git push origin HEAD:master
-
-echo "\n\n\nv${PUBLISH_VERSION} published succseed!"

package/package.json

@@ -7,7 +7,7 @@
       "url": "http://gitlab.soft-artel.com/soft-artel/ci.git"
    },
    "name": "@soft-artel/ci",
-   "version": "2.3.85",
+   "version": "2.3.87",
    "main": "sa-ci-k8s.js",
    "bin": {
       "sa-ci-k8s-build": "./commands/k8s-build.js",
@@ -21,7 +21,7 @@
       "lint+fix": "eslint --cache \"./**/*.ts\" --fix",
       "sa-commit": "sa-commit -a -p",
       "build": "rm -rf _dist && tsc -p tsconfig.json && cp package.json _dist/",
-      "pub": "ts-node ./src/commands/incrementBuild && npm run build && cd _dist && npm publish && sa-commit -a -p"
+      "pub": "ts-node ./src/commands/incrementBuild && sh _publish.sh && sa-commit -a -p"
    },
    "dependencies": {
       "axios": "1.7.2",
@@ -42,4 +42,4 @@
       "ts-node": "8.8.2",
       "typescript": "^5.4.5"
    }
-}
+}