From 6f2abbf31af35391164214b60ae2650f79e9c53c Mon Sep 17 00:00:00 2001
From: Mitch Kelley <mitchdraft@users.noreply.github.com>
Date: Wed, 6 Mar 2019 16:36:35 -0500
Subject: [PATCH] run version spec script before npm install (#118)

* run version spec script before npm install

* remove old wait spec
---
 Makefile                         | 1 +
 changelog/v0.4.6/cloudbuild.yaml | 3 +++
 cloudbuild.yaml                  | 9 +--------
 3 files changed, 5 insertions(+), 8 deletions(-)
 create mode 100644 changelog/v0.4.6/cloudbuild.yaml

diff --git a/Makefile b/Makefile
index 6fcd1fe..c908f80 100644
--- a/Makefile
+++ b/Makefile
@@ -154,6 +154,7 @@ endif
 .PHONY: package-extension
 package-extension: bump-extension-version ## (vscode) Packages extension
 ifeq ($(RELEASE),"true")
+	cd editor/vscode && npm install
 	cd editor/vscode && vsce package
 	touch $@
 endif
diff --git a/changelog/v0.4.6/cloudbuild.yaml b/changelog/v0.4.6/cloudbuild.yaml
new file mode 100644
index 0000000..417c6c8
--- /dev/null
+++ b/changelog/v0.4.6/cloudbuild.yaml
@@ -0,0 +1,3 @@
+changelog:
+- type: NON_USER_FACING
+  description: "fix build issue - need to set the version before npm install will run"
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index afffec2..fdb676a 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -71,13 +71,6 @@ steps:
   waitFor: ['docker-login', 'check-code-and-docs-gen']
   id: 'compile'
 
-- name: node:10.10.0
-  entrypoint: npm
-  args: ['install']
-  dir: './gopath/src/github.com/solo-io/squash/editor/vscode'
-  waitFor: ['dep']
-  id: 'npminstall'
-
 - name: 'gcr.io/$PROJECT_ID/go-make'
   args: ['docker-push', 'upload-github-release-assets', 'push-docs']
   env:
@@ -88,7 +81,7 @@ steps:
     - 'GCLOUD_PROJECT_ID=$PROJECT_ID'
   dir: './gopath/src/github.com/solo-io/squash'
   secretEnv: ['GITHUB_TOKEN']
-  waitFor: ['compile', 'npminstall']
+  waitFor: ['compile']
   id: 'push-github-resources'
 
 - name: 'gcr.io/$PROJECT_ID/go-vsce:0.1.4'