Skip to content

Commit 6f2abbf

Browse files
authored
run version spec script before npm install (#118)
* run version spec script before npm install * remove old wait spec
1 parent 8ab14cd commit 6f2abbf

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ endif
154154
.PHONY: package-extension
155155
package-extension: bump-extension-version ## (vscode) Packages extension
156156
ifeq ($(RELEASE),"true")
157+
cd editor/vscode && npm install
157158
cd editor/vscode && vsce package
158159
touch $@
159160
endif

changelog/v0.4.6/cloudbuild.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
changelog:
2+
- type: NON_USER_FACING
3+
description: "fix build issue - need to set the version before npm install will run"

cloudbuild.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@ steps:
7171
waitFor: ['docker-login', 'check-code-and-docs-gen']
7272
id: 'compile'
7373

74-
- name: node:10.10.0
75-
entrypoint: npm
76-
args: ['install']
77-
dir: './gopath/src/github.com/solo-io/squash/editor/vscode'
78-
waitFor: ['dep']
79-
id: 'npminstall'
80-
8174
- name: 'gcr.io/$PROJECT_ID/go-make'
8275
args: ['docker-push', 'upload-github-release-assets', 'push-docs']
8376
env:
@@ -88,7 +81,7 @@ steps:
8881
- 'GCLOUD_PROJECT_ID=$PROJECT_ID'
8982
dir: './gopath/src/github.com/solo-io/squash'
9083
secretEnv: ['GITHUB_TOKEN']
91-
waitFor: ['compile', 'npminstall']
84+
waitFor: ['compile']
9285
id: 'push-github-resources'
9386

9487
- name: 'gcr.io/$PROJECT_ID/go-vsce:0.1.4'

0 commit comments

Comments
 (0)