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

Remove -poc suffix from Manager and Worker

Browse Source 
The code is mature enough to no longer be a proof-of-concept.
This commit is contained in:
Sybren A. Stüvel 2022-02-28 13:01:13 +01:00
parent 4627169106
commit 194422d9fa
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,6 +4,8 @@
*.db *.db
*.blend[0-9] *.blend[0-9]
/flamenco-manager
/flamenco-worker
/flamenco-worker.yaml /flamenco-worker.yaml
/flamenco-worker-credentials.yaml /flamenco-worker-credentials.yaml
node_modules/ node_modules/

17
Makefile
View File

@ -5,6 +5,7 @@ PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
LDFLAGS := -X ${PKG}/internal/appinfo.ApplicationVersion=${VERSION} LDFLAGS := -X ${PKG}/internal/appinfo.ApplicationVersion=${VERSION}
BUILD_FLAGS = -ldflags="${LDFLAGS}" BUILD_FLAGS = -ldflags="${LDFLAGS}"
# Prevent any dependency that requires a C compiler, i.e. only work with pure-Go libraries.
export CGO_ENABLED=0 export CGO_ENABLED=0
all: application all: application
@ -15,13 +16,13 @@ with-deps:
go get github.com/golang/mock/mockgen@v1.6.0 go get github.com/golang/mock/mockgen@v1.6.0
$(MAKE) application $(MAKE) application
application: ${RESOURCES} generate flamenco-manager-poc flamenco-worker-poc socketio-poc application: ${RESOURCES} generate flamenco-manager flamenco-worker socketio-poc
flamenco-manager-poc: flamenco-manager:
go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-manager-poc go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-manager
flamenco-worker-poc: flamenco-worker:
go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-worker-poc go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-worker
socketio-poc: socketio-poc:
go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc
@ -64,12 +65,12 @@ lint:
clean: clean:
@go clean -i -x @go clean -i -x
rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso rm -f flamenco*-v* flamenco-manager flamenco-worker socketio-poc *.exe
rm -f pkg/api/*.gen.go internal/*/mocks/*.gen.go internal/*/*/mocks/*.gen.go rm -f pkg/api/*.gen.go internal/*/mocks/*.gen.go internal/*/*/mocks/*.gen.go
@$(MAKE) generate @$(MAKE) generate
static: vet lint generate static: vet lint generate
go build -v -o flamenco-manager-poc-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-manager-poc go build -v -o flamenco-manager-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-manager
go build -v -o flamenco-worker-poc-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-worker-poc go build -v -o flamenco-worker-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-worker
.PHONY: run application version static vet lint deploy flamenco-manager flamenco-worker socketio-poc generate with-deps .PHONY: run application version static vet lint deploy flamenco-manager flamenco-worker socketio-poc generate with-deps

0
cmd/flamenco-manager-poc/main.go → cmd/flamenco-manager/main.go
View File

0
cmd/flamenco-worker-poc/main.go → cmd/flamenco-worker/main.go
View File