@leverege/build-tools 2.2.11 → 2.2.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/server/helmify/helm.js +1 -1
- package/package.json +1 -1
- package/src/circleate +23 -12
|
@@ -52,7 +52,7 @@ function mapServiceToType(service) {
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
async function createValuesYAML(name, version, redisAccess, securityContext, preemptible, serviceType) {
|
|
55
|
-
const openPort =
|
|
55
|
+
const openPort = serviceType !== 'none';
|
|
56
56
|
const portFromEnv = process.env.PORT || process.env.SERVER_PORT;
|
|
57
57
|
const portNumber = parseInt(portFromEnv) || 8080;
|
|
58
58
|
let values = {
|
package/package.json
CHANGED
package/src/circleate
CHANGED
|
@@ -61,6 +61,13 @@ jobs:
|
|
|
61
61
|
echo "export CONTAINER_NAME=\$(cat ~/project/container_name)" >> \$BASH_ENV
|
|
62
62
|
echo "export PACKAGE_VERSION=\$(cat ~/project/package_version)" >> \$BASH_ENV
|
|
63
63
|
echo "export NODE_IMAGE=\$(cat ~/project/node_img)" >> \$BASH_ENV
|
|
64
|
+
- run:
|
|
65
|
+
name: Check for tag version
|
|
66
|
+
command: |
|
|
67
|
+
if ! [[ \$PACKAGE_VERSION =~ ^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)\$ ]]; then
|
|
68
|
+
echo "Pre-release tags detected - skipping build"
|
|
69
|
+
circleci-agent step halt
|
|
70
|
+
fi
|
|
64
71
|
- gcp-gcr/gcr-auth
|
|
65
72
|
- run:
|
|
66
73
|
name: Enable Kaniko
|
|
@@ -96,7 +103,9 @@ jobs:
|
|
|
96
103
|
steps:
|
|
97
104
|
- checkout
|
|
98
105
|
- restore_cache:
|
|
99
|
-
|
|
106
|
+
keys:
|
|
107
|
+
- v1-npm-deps-{{ checksum "package-lock.json" }}
|
|
108
|
+
- v1-npm-deps-
|
|
100
109
|
|
|
101
110
|
- run:
|
|
102
111
|
name: Setup @leverege Token
|
|
@@ -105,7 +114,7 @@ jobs:
|
|
|
105
114
|
- run: npm install
|
|
106
115
|
|
|
107
116
|
- save_cache:
|
|
108
|
-
key:
|
|
117
|
+
key: v1-npm-deps-{{ checksum "package-lock.json" }}
|
|
109
118
|
paths:
|
|
110
119
|
- ./node_modules
|
|
111
120
|
|
|
@@ -232,7 +241,6 @@ jobs:
|
|
|
232
241
|
- run:
|
|
233
242
|
name: Determine version number and container name
|
|
234
243
|
command: |
|
|
235
|
-
PACKAGE_VERSION=\$(node -p "require('./package.json').version")
|
|
236
244
|
container="\`node -p \"require('./package.json').leverege.container\"\`"
|
|
237
245
|
if [ "\$container" == "undefined" ];
|
|
238
246
|
then
|
|
@@ -240,14 +248,13 @@ jobs:
|
|
|
240
248
|
fi
|
|
241
249
|
NODE_IMAGE="\`node -p \"require('./package.json').leverege.nodeimg\"\`"
|
|
242
250
|
|
|
243
|
-
echo
|
|
244
|
-
echo "export PACKAGE_VERSION=v\${PACKAGE_VERSION}" >> \$BASH_ENV
|
|
251
|
+
echo \$(git describe --tags) > package_version
|
|
245
252
|
echo \${container} > container_name
|
|
246
253
|
echo \${NODE_IMAGE} > node_img
|
|
247
254
|
|
|
248
255
|
- run:
|
|
249
256
|
name: Create Dockerfile and build dist directory
|
|
250
|
-
command: mkdir -p docker && npm run dockerize \$
|
|
257
|
+
command: mkdir -p docker && npm run dockerize \$(git describe --tags)
|
|
251
258
|
|
|
252
259
|
- persist_to_workspace:
|
|
253
260
|
root: ~/project
|
|
@@ -322,8 +329,10 @@ jobs:
|
|
|
322
329
|
steps:
|
|
323
330
|
- checkout
|
|
324
331
|
- restore_cache:
|
|
325
|
-
|
|
326
|
-
|
|
332
|
+
keys:
|
|
333
|
+
- v1-npm-deps-{{ checksum "package-lock.json" }}
|
|
334
|
+
- v1-npm-deps-
|
|
335
|
+
|
|
327
336
|
- run:
|
|
328
337
|
name: Setup @leverege Token
|
|
329
338
|
command: echo \${NPMRC} > ~/.npmrc
|
|
@@ -331,7 +340,7 @@ jobs:
|
|
|
331
340
|
- run: npm install
|
|
332
341
|
|
|
333
342
|
- save_cache:
|
|
334
|
-
key:
|
|
343
|
+
key: v1-npm-deps-{{ checksum "package-lock.json" }}
|
|
335
344
|
paths:
|
|
336
345
|
- ./node_modules
|
|
337
346
|
|
|
@@ -540,8 +549,10 @@ jobs:
|
|
|
540
549
|
steps:
|
|
541
550
|
- checkout
|
|
542
551
|
- restore_cache:
|
|
543
|
-
|
|
544
|
-
|
|
552
|
+
keys:
|
|
553
|
+
- v1-npm-deps-{{ checksum "package-lock.json" }}
|
|
554
|
+
- v1-npm-deps-
|
|
555
|
+
|
|
545
556
|
- run:
|
|
546
557
|
name: Setup @leverege Token
|
|
547
558
|
command: echo \${NPMRC} > ~/.npmrc
|
|
@@ -549,7 +560,7 @@ jobs:
|
|
|
549
560
|
- run: npm install
|
|
550
561
|
|
|
551
562
|
- save_cache:
|
|
552
|
-
key:
|
|
563
|
+
key: v1-npm-deps-{{ checksum "package-lock.json" }}
|
|
553
564
|
paths:
|
|
554
565
|
- ./node_modules
|
|
555
566
|
|