Some build & filename tweaks to allow building from scratch again
The build chain got a bit confused when doing things from scratch, as `test_support.go` was used in the non-test builds. Renaming it to `support_test.go` was the easiest way to avoid that.
This commit is contained in:
parent
9a5bbb4131
commit
17e622ebc3
9
Makefile
9
Makefile
@ -29,7 +29,7 @@ all: application
|
||||
with-deps:
|
||||
go get github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.9.0
|
||||
go get github.com/golang/mock/mockgen@v1.6.0
|
||||
make -s application
|
||||
$(MAKE) application
|
||||
|
||||
application: ${RESOURCES} generate flamenco-manager-poc flamenco-worker-poc socketio-poc
|
||||
|
||||
@ -43,7 +43,7 @@ socketio-poc:
|
||||
go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc
|
||||
|
||||
generate:
|
||||
go generate ./pkg/...
|
||||
go generate ./pkg/api/...
|
||||
go generate ./internal/...
|
||||
|
||||
# resource.syso: resource/thermogui.ico resource/versioninfo.json
|
||||
@ -81,7 +81,8 @@ lint:
|
||||
|
||||
clean:
|
||||
@go clean -i -x
|
||||
rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso pkg/api/*.gen.go
|
||||
rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso
|
||||
rm -f pkg/api/*.gen.go internal/*/mocks/*.gen.go internal/*/*/mocks/*.gen.go
|
||||
@$(MAKE) generate
|
||||
|
||||
# static: vet lint resource.syso
|
||||
@ -147,4 +148,4 @@ _package_zip: static
|
||||
cd $(dir ${PACKAGE_PATH}) && zip -9 -r -q $(notdir ${PACKAGE_PATH})-${GOOS}.zip $(notdir ${PACKAGE_PATH})
|
||||
rm ${STATIC_OUT}
|
||||
|
||||
.PHONY: run application version static vet lint deploy package release prepare flamenco-manager-poc flamenco-worker-poc socketio-poc generate
|
||||
.PHONY: run application version static vet lint deploy package release prepare flamenco-manager-poc flamenco-worker-poc socketio-poc generate with-deps
|
||||
|
@ -36,11 +36,12 @@ import (
|
||||
)
|
||||
|
||||
type mockedFlamenco struct {
|
||||
flamenco *Flamenco
|
||||
jobCompiler *mocks.MockJobCompiler
|
||||
persistence *mocks.MockPersistenceService
|
||||
logStorage *mocks.MockLogStorage
|
||||
config *mocks.MockConfigService
|
||||
flamenco *Flamenco
|
||||
jobCompiler *mocks.MockJobCompiler
|
||||
persistence *mocks.MockPersistenceService
|
||||
logStorage *mocks.MockLogStorage
|
||||
config *mocks.MockConfigService
|
||||
stateMachine *mocks.MockTaskStateMachine
|
||||
}
|
||||
|
||||
func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco {
|
||||
@ -48,14 +49,16 @@ func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco {
|
||||
ps := mocks.NewMockPersistenceService(mockCtrl)
|
||||
ls := mocks.NewMockLogStorage(mockCtrl)
|
||||
cs := mocks.NewMockConfigService(mockCtrl)
|
||||
f := NewFlamenco(jc, ps, ls, cs)
|
||||
sm := mocks.NewMockTaskStateMachine(mockCtrl)
|
||||
f := NewFlamenco(jc, ps, ls, cs, sm)
|
||||
|
||||
return mockedFlamenco{
|
||||
flamenco: f,
|
||||
jobCompiler: jc,
|
||||
persistence: ps,
|
||||
logStorage: ls,
|
||||
config: cs,
|
||||
flamenco: f,
|
||||
jobCompiler: jc,
|
||||
persistence: ps,
|
||||
logStorage: ls,
|
||||
config: cs,
|
||||
stateMachine: sm,
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user