chore(backend): update template to v0.3.0, conflicts left
This commit is contained in:
1 parent
a1188d806a
commit
3b5c35ab8a
2 files changed
+9
-1
No files matched your search
@@ -1,10 +1,15 @@
|
||||
COMPOSE := cd .. && docker compose
|
||||
<<<<<<< before updating
|
||||
IMAGE := lodge/backend
|
||||
LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2
|
||||
changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
|
||||
stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
|
||||
|
||||
.PHONY: fmt check test build pre-deploy post-deploy client dev
|
||||
=======
|
||||
|
||||
.PHONY: fmt check build
|
||||
>>>>>>> after updating
|
||||
|
||||
fmt:
|
||||
go mod tidy
|
||||
@@ -19,6 +24,7 @@ test:
|
||||
|
||||
build:
|
||||
$(COMPOSE) build api
|
||||
<<<<<<< before updating
|
||||
|
||||
pre-deploy:
|
||||
@if $(call changed,refs/deploy/backend,.) || ! docker image inspect $(IMAGE) >/dev/null 2>&1; then \
|
||||
@@ -33,3 +39,5 @@ client:
|
||||
|
||||
dev:
|
||||
LODGE_DB=storage/lodge.db STATIC_DIR=../frontend/build CLIENTS_DIR=bin ADMIN_TOKEN=dev go run ./cmd/lodge-server
|
||||
=======
|
||||
>>>>>>> after updating
|
||||
Reference in new issue
Block a user