@leverege/build-tools 2.12.0 → 2.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.12.0",
+  "version": "2.13.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
     "repository": {
@@ -70,10 +70,10 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.17.10",
+    "@babel/core": "^7.18.0",
     "@babel/node": "^7.17.10",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.9.0"
+    "npm": "^8.10.0"
   }
 }

package/src/dockreate

@@ -31,7 +31,12 @@ fi
 
 function packageJson() {
   result=$(jq -r $1 $GITTOP/package.json)
-  [ "$result" != "null" ] && echo $result
+  if [ "$result" != "null" ]
+  then
+    echo $result
+  else
+    echo $2
+  fi
 }
 
 # Global Vars
@@ -237,9 +242,17 @@ NOCONTAINER
   fi
   container=$(basename $gitremote .git)
 fi
+
+# registry specifications
 gcimage=gcr.io/$project/$container
-artifactory=us-docker.pkg.dev/leverege-registry/artifactory
-registry=$artifactory/$container/images
+
+registry=
+artifact=$(packageJson '.leverege.artifact') # 'leverege')
+if [ ! -z "$artifact" ];
+then
+  imagerepo=us-docker.pkg.dev/leverege-registry
+  registry=$imagerepo/$artifact/$container/images
+fi
 
 version=$1
 [[ -f '.previous' ]] && previous=`cat .previous` || previous='FIRST BUILD'
@@ -317,7 +330,7 @@ cat<<IMGINFO
   Previous:  $(color y $previous)
   DateStamp: $(color g $pckgdts)
   GCImage:   $(color g $gcimage:$version)
-  Registry:  $(color y $registry:$version)
+  Registry:  $(color y $registry)
 
 IMGINFO
 
@@ -326,7 +339,7 @@ then
   cat<<EOPKG
   $(color y '***WARNING: specified version does not match package.json version' )
                    package.json => $(color g "$pckgver")
-                   specified    => $(color r   "$version")
+                   specified    => $(color r "$version")
 
 EOPKG
   if [ $tagging ];
@@ -389,17 +402,14 @@ fi
 
 # Tag the container with the node detailsand the culprit.
 gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
-if [ "$USE_ARTIFACTORY" == "yes" ];
+if [ ! -z "$artifact" ];
 then
   cat<<END_ARTY
 
-  Sending `color y $gcimage:$version` to the `color g artifactory`
-  in the background, which may take up to a minute to complete.
-
-  `color g 'Thank you for testing!'`
+  Building image `color y $gcimage:$version` for the image `color g artifactory`
 
 END_ARTY
-  gcloud container images add-tag --quiet $gcimage:$version $registry:$version &
+  time gcloud container images add-tag --quiet $gcimage:$version $registry:$version $registry:$pckgdts-$nodeimg-$USER
 fi
 
 if [ $tagging ];
@@ -408,6 +418,7 @@ then
   git tag -af $1 -m "Docker version $1"
   git push --follow-tags
   gcloud container images add-tag --quiet $gcimage:$version $gcimage:latest
+  [ ! -z "$artifact" ] && gcloud container images add-tag --quiet $registry:$version $registry:latest
 else
   printf "\n$(color y '*** Skipped git tagging - beta release')\n\n"
 fi

package/src/push-my-chart

@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+
+const execa = require( 'execa' )
+const semverLt = require( 'semver/functions/lt' )
+
+const pushItGood = async () => {
+  const version = await execa( 'helm', [ 'version', '--short' ] )
+  const pusher = ( semverLt( version.stdout, '3.7.0' ) ? 'push' : 'cm-push' )
+
+  try {
+    const museum = await execa ( 'helm', [ pusher, 'helm', 'leverege' ] )
+    console.log( museum.stdout )
+  } catch ( ex ) {
+    console.log( ex.stderr )
+    process.exit( 1 )
+  }
+}
+
+pushItGood()