Split up Go and JS in CircleCI configuration (#2081)

This removes reliance on the custom kolide/fleet-builder container for CI.
This commit is contained in:
seph
2019-07-29 09:31:42 -07:00
committed by Zachary Wasserman
parent cfffff61cc
commit 91e365bbd5
2 changed files with 32 additions and 11 deletions
+19 -8
View File
@@ -1,10 +1,10 @@
version: 2
jobs:
build-go1.9:
build-go:
docker:
- image: kolide/fleet-builder:1.9
- image: golang:1.12
working_directory: /go/src/github.com/kolide/fleet
steps: &steps
steps: &stepsgo
- checkout
- restore_cache:
keys:
@@ -12,7 +12,7 @@ jobs:
- vendor-cache-{{ .Branch }}
- vendor-cache
- run: make deps
- run: make deps-go
- save_cache:
key: vendor-cache-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
paths:
@@ -25,13 +25,24 @@ jobs:
key: vendor-cache
paths:
- vendor
- run: make generate
- run: make test
- run: make generate-go
- run: make lint-go
- run: make test-go
- run: make build
build-js:
docker:
- image: node:10.16.0
steps: &stepsjs
- checkout
- run: make deps-js
- run: make generate-js
- run: make lint-js
- run: make test-js
workflows:
version: 2
build:
jobs:
- build-go1.9
- build-go
- build-js
+13 -3
View File
@@ -60,7 +60,9 @@ define HELP_TEXT
Makefile commands
make deps - Install dependent programs and libraries
make generate - Generate and bundle required code
make generate - Generate and bundle required all code
make generate-go - Generate and bundle required go code
make generate-js - Generate and bundle required js code
make generate-dev - Generate and bundle required code in a watch loop
make distclean - Delete all build artifacts
@@ -139,8 +141,12 @@ test-js:
test: lint test-go test-js
generate: .prefix
generate: generate-js generate-go
generate-js: .prefix
NODE_ENV=production webpack --progress --colors
generate-go: .prefix
go-bindata -pkg=service \
-o=server/service/bindata.go \
frontend/templates/ assets/...
@@ -158,8 +164,12 @@ generate-dev: .prefix
go-bindata -pkg=kolide -o=server/kolide/bindata.go server/mail/templates
webpack --progress --colors --watch
deps:
deps: deps-js deps-go
deps-js:
yarn
deps-go:
go get -u \
github.com/kolide/go-bindata/... \
github.com/golang/dep/cmd/dep \