blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some build & filename tweaks to allow building from scratch again

Browse Source 
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:
Sybren A. Stüvel 2022-02-25 16:08:08 +01:00
parent 9a5bbb4131
commit 17e622ebc3
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -29,7 +29,7 @@ all: application
with-deps: with-deps:
go get github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.9.0 go get github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.9.0
go get github.com/golang/mock/mockgen@v1.6.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 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 go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc
generate: generate:
go generate ./pkg/... go generate ./pkg/api/...
go generate ./internal/... go generate ./internal/...
# resource.syso: resource/thermogui.ico resource/versioninfo.json # resource.syso: resource/thermogui.ico resource/versioninfo.json
@ -81,7 +81,8 @@ lint:
clean: clean:
@go clean -i -x @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 @$(MAKE) generate
# static: vet lint resource.syso # 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}) cd $(dir ${PACKAGE_PATH}) && zip -9 -r -q $(notdir ${PACKAGE_PATH})-${GOOS}.zip $(notdir ${PACKAGE_PATH})
rm ${STATIC_OUT} 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

25
internal/manager/api_impl/test_support.go → internal/manager/api_impl/support_test.go
View File

@ -36,11 +36,12 @@ import (
) )
type mockedFlamenco struct { type mockedFlamenco struct {
flamenco *Flamenco flamenco *Flamenco
jobCompiler *mocks.MockJobCompiler jobCompiler *mocks.MockJobCompiler
persistence *mocks.MockPersistenceService persistence *mocks.MockPersistenceService
logStorage *mocks.MockLogStorage logStorage *mocks.MockLogStorage
config *mocks.MockConfigService config *mocks.MockConfigService
stateMachine *mocks.MockTaskStateMachine
} }
func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco { func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco {
@ -48,14 +49,16 @@ func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco {
ps := mocks.NewMockPersistenceService(mockCtrl) ps := mocks.NewMockPersistenceService(mockCtrl)
ls := mocks.NewMockLogStorage(mockCtrl) ls := mocks.NewMockLogStorage(mockCtrl)
cs := mocks.NewMockConfigService(mockCtrl) cs := mocks.NewMockConfigService(mockCtrl)
f := NewFlamenco(jc, ps, ls, cs) sm := mocks.NewMockTaskStateMachine(mockCtrl)
f := NewFlamenco(jc, ps, ls, cs, sm)
return mockedFlamenco{ return mockedFlamenco{
flamenco: f, flamenco: f,
jobCompiler: jc, jobCompiler: jc,
persistence: ps, persistence: ps,
logStorage: ls, logStorage: ls,
config: cs, config: cs,
stateMachine: sm,
} }
} }