@leverege/build-tools 2.61.3 → 2.61.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.61.3",
+  "version": "2.61.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/Docker.mjs

@@ -203,7 +203,7 @@ const buildContainerImage = async ( {
   setPreviousBuild( imageVersion ) // update docker/.previous file
 
   const { fullName : builderName } = await getGcpAccount()
-  const gcloudBuild = `time gcloud builds submit --project ${artifactProject}`
+  const gcloudBuild = `gcloud builds submit --project ${artifactProject}`
   const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
   let gcloudTags = `--tag ${imageName}:${imageVersion}`
   

package/src/Utils.mjs

@@ -54,6 +54,10 @@ export const isString = ( s ) => {
  * General "yes" to proceed function.
  */
 export const proceed = async ( query = 'Do you wish to proceed?' ) => {
+  if ( process.env.CICD_PIPELINE === '1' ) {
+    log( '\n*** CICD Pipeline - skipping user prompts' )
+    return
+  }
   await inquirer.prompt( [
     {
       type : 'confirm',
@@ -399,6 +403,7 @@ export const getRepositoryDescr = async () => {
   const currentDir = process.cwd()
   const workingDir = process.env.PWD
   const gitRoot = await getGitRootDirectory()
+  const isGitRepo = gitRoot !== undefined
   const gitHooksPath = await getGitHooksPath()
   const { branch : gitBranch, upstream : gitUpstream } = await getGitBranchAndUpstream()
   const subPkgs = await glob( `${gitRoot}/packages/**/package.json`, { ignore : '/**/node_modules/**' } )
@@ -420,6 +425,7 @@ export const getRepositoryDescr = async () => {
     gitRoot,
     gitUpstream,
     helmChart,
+    isGitRepo,
     isMonoRepo,
     isNpmWorkspace,
     rootPackageJson,

package/src/helm-charts/prom-operator/helmup.plugin

@@ -4,20 +4,23 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="67"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="68"
 
 NS="--namespace prometheus"
 
+# https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
 helm upgrade $NS --install prometheus-stack prometheus-community/kube-prometheus-stack \
                  --values  prom-operator/prometheus-stack.yaml \
                  --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
 
+# https://artifacthub.io/packages/helm/prometheus-community/prometheus-elasticsearch-exporter
 showInstalling "The Elasticsearch Exporter (prom-operator)"
 [ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="6"
 helm upgrade $NS --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
                  --values prom-operator/elasticsearch-exporter.yaml \
                  --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
 
+# https://artifacthub.io/packages/helm/prometheus-community/prometheus-stackdriver-exporter
 showInstalling "The Stackdriver Exporter (prom-operator)"
 [ -z "$STACKDRIVER_EXPORTER_CHART_VERSION" ] && STACKDRIVER_EXPORTER_CHART_VERSION="4"
 helm upgrade $NS --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \

package/src/hook-and-release/Config.mjs

@@ -128,6 +128,15 @@ export default class Config {
 
   async bootstrapHookAndRelease() {
     const repoDescr = await getRepositoryDescr()
+    if ( !repoDescr.isGitRepo ) {
+      const notGitRepo = `
+  The hook-and-release script only works with git repositories. Try running:
+
+      git init && hook-and-release --init
+
+  to initialize git and hook-and-release.`
+      errorExit( notGitRepo )
+    }
     this.gitRoot = repoDescr.gitRoot
     this.gitBranch = repoDescr.gitBranch
     this.gitHooksPath = repoDescr.gitHooksPath