Build with Magefile #104341

Merged
Sybren A. Stüvel merged 26 commits from magefile into main 2024-10-04 21:59:46 +02:00
2 changed files with 4 additions and 8 deletions
Showing only changes of commit 1bea8b40f7 - Show all commits

View File

@ -54,11 +54,10 @@ with-deps:
go install github.com/golang/mock/mockgen@v1.6.0 go install github.com/golang/mock/mockgen@v1.6.0
$(MAKE) application $(MAKE) application
vet: vet: buildtool
go vet ./... "${BUILDTOOL_PATH}" vet
go run golang.org/x/vuln/cmd/govulncheck@latest ./...
application: webapp flamenco-manager flamenco-worker application: flamenco-manager flamenco-worker
flamenco-manager: buildtool flamenco-manager: buildtool
"${BUILDTOOL_PATH}" flamencoManager "${BUILDTOOL_PATH}" flamencoManager
@ -89,9 +88,6 @@ db-migrate-down:
goose -dir ./internal/manager/persistence/migrations/ sqlite3 flamenco-manager.sqlite down goose -dir ./internal/manager/persistence/migrations/ sqlite3 flamenco-manager.sqlite down
.PHONY: db-migrate-status db-migrate-up db-migrate-down .PHONY: db-migrate-status db-migrate-up db-migrate-down
webapp:
yarn --cwd web/app install
webapp-static: buildtool webapp-static: buildtool
"${BUILDTOOL_PATH}" webappStatic "${BUILDTOOL_PATH}" webappStatic

View File

@ -77,7 +77,7 @@ func WebappStatic() error {
return err return err
} }
fmt.Printf("Web app has been installed into %s", webStatic) fmt.Printf("Web app has been installed into %s\n", webStatic)
// Build the add-on ZIP as it's part of the static web files. // Build the add-on ZIP as it's part of the static web files.
zipPath := filepath.Join(webStatic, "flamenco3-addon.zip") zipPath := filepath.Join(webStatic, "flamenco3-addon.zip")