Skip to content

Commit

Permalink
test change to cloudbuild (#112)
Browse files Browse the repository at this point in the history
* test change to cloudbuild

* changelog, wait for install

* wait for dep

* tabs, not spaces for Makefiles

* restore guards
  • Loading branch information
mitchdraft authored Mar 6, 2019
1 parent e77c988 commit 05c1b6d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $(OUTPUT_DIR)/squashctl-windows.exe: $(SRCS)
.PHONY: squash
squash: $(OUTPUT_DIR)/squash-container

$(OUTPUT_DIR)/squash: $(SRCS) generatecode
$(OUTPUT_DIR)/squash: $(SRCS)
GOOS=linux go build -ldflags=$(LDFLAGS) -o $(OUTPUT_DIR)/squash/squash cmd/squash/main.go
$(OUTPUT_DIR)/squash-container: $(OUTPUT_DIR)/squash
docker build -f cmd/squash/Dockerfile -t $(DOCKER_REPO)/squash:$(VERSION) $(OUTPUT_DIR)/squash/
Expand All @@ -119,7 +119,7 @@ $(OUTPUT_DIR)/squash-container: $(OUTPUT_DIR)/squash
.PHONY: plank
plank: $(OUTPUT_DIR)/plank-dlv-container $(OUTPUT_DIR)/plank-gdb-container

$(OUTPUT_DIR)/plank/: generatecode
$(OUTPUT_DIR)/plank/:
[ -d $@ ] || mkdir -p $@

$(OUTPUT_DIR)/plank/plank: | $(OUTPUT_DIR)/plank/
Expand Down Expand Up @@ -148,17 +148,20 @@ $(OUTPUT_DIR)/plank-gdb-container: $(OUTPUT_DIR)/plank/plank $(OUTPUT_DIR)/plank
publish-extension: package-extension ## (vscode) Publishes extension
ifeq ($(RELEASE),"true")
./hack/publish-extension.sh
touch $@
endif

.PHONY: package-extension
package-extension: bump-extension-version ## (vscode) Packages extension
ifeq ($(RELEASE),"true")
cd editor/vscode && vsce package
touch $@
endif

.PHONY: bump-extension-version
bump-extension-version: ## (vscode) Bumps extension version
go run ci/bump_extension_version.go $(VERSION)
touch $@


#----------------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions changelog/v0.4.2/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 - missing binaries"
9 changes: 8 additions & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ 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-vsce:0.1.3'
entrypoint: make
args: ['docker-push', 'upload-github-release-assets', 'push-docs', 'publish-extension']
Expand All @@ -81,7 +88,7 @@ steps:
dir: './gopath/src/github.com/solo-io/squash'
secretEnv: ['GITHUB_TOKEN', 'VSCODE_TOKEN']
id: 'release'
waitFor: ['compile']
waitFor: ['compile', 'npminstall']

secrets:
- kmsKeyName: projects/solo-public/locations/global/keyRings/build/cryptoKeys/build-key
Expand Down

0 comments on commit 05c1b6d

Please sign in to comment.