Skip to content

Commit

Permalink
run version spec script before npm install (#118)
Browse files Browse the repository at this point in the history
* run version spec script before npm install

* remove old wait spec
  • Loading branch information
mitchdraft authored Mar 6, 2019
1 parent 8ab14cd commit 6f2abbf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions changelog/v0.4.6/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog:
- type: NON_USER_FACING
description: "fix build issue - need to set the version before npm install will run"
9 changes: 1 addition & 8 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down

0 comments on commit 6f2abbf

Please sign in to comment.