Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ jobs:
export PATH="${PATH}:$(go env GOPATH)/bin"
cd internal/api/protobuf && ./generate.sh

# handler.go uses //go:embed swagger.yaml; file is gitignored locally but required for typecheck
- name: Prepare OpenAPI embed for lint
working-directory: api
run: cp docs/swagger.yaml internal/api/http/swagger.yaml

- name: Install golangci-lint
run: |
export PATH="${PATH}:$(go env GOPATH)/bin"
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ jobs:
run: |
cd internal/api/protobuf && ./generate.sh

# Same as lint.yml / Docker: //go:embed swagger.yaml next to handler.go
- name: Prepare OpenAPI embed
working-directory: api
run: cp docs/swagger.yaml internal/api/http/swagger.yaml

- name: Run tests
working-directory: api
run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./...
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@ prompt.md
api/internal/api/http/docs.go
api/internal/api/http/swagger.yaml
api/internal/api/http/swagger.json
ffm/public/runtime-config.js
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ COMPOSE_DEV_FILE := deploy/docker-compose.dev.yml

dev-docker: dev-docker-build ## Start all services in Docker with hot-reload
@echo "$(GREEN)Starting development environment with hot-reload in Docker...$(NC)"
docker compose -f $(COMPOSE_DEV_FILE) up -d
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) up -d
@echo "$(GREEN)Development environment ready!$(NC)"
@echo ""
@echo " BFM Server: http://localhost:7070"
Expand All @@ -382,36 +382,36 @@ dev-docker: dev-docker-build ## Start all services in Docker with hot-reload

dev-docker-build: ## Build development Docker images
@echo "$(GREEN)Building development images...$(NC)"
docker compose -f $(COMPOSE_DEV_FILE) build
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) build

dev-docker-down: ## Stop development Docker services
@echo "$(YELLOW)Stopping development services...$(NC)"
docker compose -f $(COMPOSE_DEV_FILE) down
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) down

dev-docker-logs: ## Show logs from development services
docker compose -f $(COMPOSE_DEV_FILE) logs -f
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) logs -f

dev-docker-logs-bfm: ## Show logs from BFM server (dev)
docker compose -f $(COMPOSE_DEV_FILE) logs -f bfm-server
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) logs -f bfm-server

dev-docker-logs-ffm: ## Show logs from FFM frontend (dev)
docker compose -f $(COMPOSE_DEV_FILE) logs -f ffm
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) logs -f ffm

dev-docker-ps: ## Show status of development services
@echo "$(GREEN)Development Service Status:$(NC)"
@docker compose -f $(COMPOSE_DEV_FILE) ps
@docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) ps

dev-docker-restart: ## Restart development services
@echo "$(YELLOW)Restarting development services...$(NC)"
docker compose -f $(COMPOSE_DEV_FILE) restart
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) restart
@make dev-docker-ps

dev-docker-clean: ## Stop and remove development containers and volumes
@echo "$(RED)WARNING: This will remove all development containers and volumes!$(NC)"
@read -p "Are you sure? [y/N] " -n 1 -r; \
echo; \
if [[ $$REPLY =~ ^[Yy]$$ ]]; then \
docker compose -f $(COMPOSE_DEV_FILE) down -v; \
docker compose -p bfm-dev -f $(COMPOSE_DEV_FILE) down -v; \
echo "$(GREEN)Cleanup complete!$(NC)"; \
fi

Expand Down
Loading
Loading