chore(backend): update template to v0.3.0, conflicts left

This commit is contained in:
renovate Bot committed 2026-10-10 00:30:42 +00:00
1 parent a1188d806a
commit 3b5c35ab8a
2 files changed
+9 -1

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
_commit: v0.1.0 _commit: v0.3.0
_src_path: https://git.kotikot.com/templates/blank.git _src_path: https://git.kotikot.com/templates/blank.git
layout: part layout: part
part: backend part: backend
+8
View File
@@ -1,10 +1,15 @@
COMPOSE := cd .. && docker compose COMPOSE := cd .. && docker compose
<<<<<<< before updating
IMAGE := lodge/backend IMAGE := lodge/backend
LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2 LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2
changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
stamp = { git update-ref $(1) HEAD 2>/dev/null || true; } stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
.PHONY: fmt check test build pre-deploy post-deploy client dev .PHONY: fmt check test build pre-deploy post-deploy client dev
=======
.PHONY: fmt check build
>>>>>>> after updating
fmt: fmt:
go mod tidy go mod tidy
@@ -19,6 +24,7 @@ test:
build: build:
$(COMPOSE) build api $(COMPOSE) build api
<<<<<<< before updating
pre-deploy: pre-deploy:
@if $(call changed,refs/deploy/backend,.) || ! docker image inspect $(IMAGE) >/dev/null 2>&1; then \ @if $(call changed,refs/deploy/backend,.) || ! docker image inspect $(IMAGE) >/dev/null 2>&1; then \
@@ -33,3 +39,5 @@ client:
dev: dev:
LODGE_DB=storage/lodge.db STATIC_DIR=../frontend/build CLIENTS_DIR=bin ADMIN_TOKEN=dev go run ./cmd/lodge-server LODGE_DB=storage/lodge.db STATIC_DIR=../frontend/build CLIENTS_DIR=bin ADMIN_TOKEN=dev go run ./cmd/lodge-server
=======
>>>>>>> after updating