Add jobserver command to platform binary (#7067)
* Add jobserver command to platform binary * Fixing jobserver config. Adding jobserver flags. * Fixing govet in makefile
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
88f398ffdd
Коммит
0331409488
17
Makefile
17
Makefile
@@ -365,20 +365,6 @@ build-client:
|
||||
|
||||
cd $(BUILD_WEBAPP_DIR) && $(MAKE) build
|
||||
|
||||
build-job-server: build-job-server-linux build-job-server-mac build-job-server-windows
|
||||
|
||||
build-job-server-linux: .prebuild prepare-enterprise
|
||||
@echo Build mattermost job server for Linux amd64
|
||||
env GOOS=linux GOARCH=amd64 $(GO) build $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver
|
||||
|
||||
build-job-server-osx: .prebuild prepare-enterprise
|
||||
@echo Build mattermost job server for OSX amd64
|
||||
env GOOS=darwin GOARCH=amd64 $(GO) build $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver
|
||||
|
||||
build-job-server-windows: .prebuild prepare-enterprise
|
||||
@echo Build mattermost job server for Windows amd64
|
||||
env GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver
|
||||
|
||||
package: build build-client
|
||||
@ echo Packaging mattermost
|
||||
|
||||
@@ -515,7 +501,7 @@ restart-client: | stop-client run-client
|
||||
|
||||
run-job-server:
|
||||
@echo Running job server for development
|
||||
$(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver/jobserver.go
|
||||
$(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform/*.go jobserver --disableconfigwatch &
|
||||
|
||||
clean: stop-docker
|
||||
@echo Cleaning
|
||||
@@ -556,7 +542,6 @@ govet:
|
||||
$(GO) vet $(GOFLAGS) ./cmd/platform || exit 1
|
||||
$(GO) vet $(GOFLAGS) ./einterfaces || exit 1
|
||||
$(GO) vet $(GOFLAGS) ./jobs || exit 1
|
||||
$(GO) vet $(GOFLAGS) ./jobs/jobserver || exit 1
|
||||
$(GO) vet $(GOFLAGS) ./manualtesting || exit 1
|
||||
$(GO) vet $(GOFLAGS) ./model || exit 1
|
||||
$(GO) vet $(GOFLAGS) ./model/gitlab || exit 1
|
||||
|
||||
Ссылка в новой задаче
Block a user