Clean up

Author: domdomegg

.github/workflows/ci.yml

@@ -2,50 +2,17 @@ name: CI Pipeline
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main ]
 
 env:
   GO_VERSION: '1.23.x'
 
 jobs:
-  # Lint and Format Check
-  lint:
-    name: Lint and Format
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ env.GO_VERSION }}
-    - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@v8
-      with:
-        version: v2.3.1
-
-  # Schema and Example Validation
-  validate:
-    name: Validate Schemas and Examples
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ env.GO_VERSION }}
-
-    - name: Validate schemas and examples
-      run: make validate
-
-  # Build check
-  build:
-    name: Build Check
+  # Build, Lint, and Validate
+  build-lint-validate:
+    name: Build, Lint, and Validate
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
@@ -69,6 +36,16 @@ jobs:
     - name: Download dependencies
       run: go mod download
 
+    - name: Install golangci-lint
+      run: |
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.3.1
+        
+    - name: Run lint
+      run: make lint
+      
+    - name: Validate schemas and examples
+      run: make validate
+      
     - name: Build application
       run: make build
 
@@ -77,11 +54,11 @@ jobs:
         go install golang.org/x/vuln/cmd/govulncheck@latest
         govulncheck ./...
 
-  # Unit Tests
-  unit-tests:
-    name: Unit Tests
+  # All Tests
+  tests:
+    name: Tests
     runs-on: ubuntu-latest
-    needs: [lint, validate, build]
+    needs: build-lint-validate
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -104,8 +81,8 @@ jobs:
     - name: Download dependencies
       run: go mod download
 
-    - name: Run unit tests
-      run: make test
+    - name: Run all tests
+      run: make test-all
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
@@ -114,52 +91,3 @@ jobs:
         flags: unittests
         name: codecov-unit
         fail_ci_if_error: false
-
-  # Integration Tests
-  integration-tests:
-    name: Integration Tests
-    runs-on: ubuntu-latest
-    needs: [lint, validate, build]
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ env.GO_VERSION }}
-        
-    - name: Cache Go modules
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-          
-    - name: Download dependencies
-      run: go mod download
-      
-    - name: Run integration tests
-      run: make integration-test
-
-  # Overall status check
-  test-summary:
-    name: Test Summary
-    runs-on: ubuntu-latest
-    needs: [unit-tests, integration-tests]
-    if: always()
-    steps:
-    - name: Check test results
-      run: |
-        if [[ "${{ needs.unit-tests.result }}" == "success" && "${{ needs.integration-tests.result }}" == "success" ]]; then
-          echo "✅ All tests passed!"
-          exit 0
-        else
-          echo "❌ Some tests failed:"
-          echo "  Unit tests: ${{ needs.unit-tests.result }}"
-          echo "  Integration tests: ${{ needs.integration-tests.result }}"
-          exit 1
-        fi

.github/workflows/integration-tests.yml

@@ -8,3 +8,5 @@ cmd/registry/registry
 validate-examples
 validate-schemas
 .idea/
+coverage.out
+coverage.html

.github/workflows/unit-tests.yml

@@ -1,4 +1,4 @@
-.PHONY: help build test lint lint-fix validate validate-schemas validate-examples integration-test check dev-local dev-compose clean docker publisher coverage
+.PHONY: help build test test-unit test-integration test-endpoints test-publish test-all lint lint-fix validate validate-schemas validate-examples check pre-commit ci dev-local dev-compose clean publisher
 
 # Default target
 help: ## Show this help message
@@ -12,14 +12,17 @@ build: ## Build the registry application
 publisher: ## Build the publisher tool
 	cd tools/publisher && ./build.sh
 
-docker: ## Build Docker image
-	docker build -t registry .
-
 # Test targets
-test: ## Run unit tests
+test-unit: ## Run unit tests with coverage
 	go test -v -race -coverprofile=coverage.out -covermode=atomic ./internal/...
+	go tool cover -html=coverage.out -o coverage.html
+	@echo "Coverage report generated: coverage.html"
+
+test: ## Run unit tests (use 'make test-all' to run all tests)
+	@echo "⚠️  Running unit tests only. Use 'make test-all' to run both unit and integration tests."
+	@$(MAKE) test-unit
 
-integration-test: ## Run integration tests
+test-integration: ## Run integration tests
 	./tests/integration/run.sh
 
 test-endpoints: ## Test API endpoints (requires running server)
@@ -28,6 +31,8 @@ test-endpoints: ## Test API endpoints (requires running server)
 test-publish: ## Test publish endpoint (requires BEARER_TOKEN env var)
 	./scripts/test_publish.sh
 
+test-all: test-unit test-integration ## Run all tests (unit and integration)
+
 # Validation targets
 validate-schemas: ## Validate JSON schemas
 	./tools/validate-schemas.sh
@@ -37,34 +42,29 @@ validate-examples: ## Validate examples against schemas
 
 validate: validate-schemas validate-examples ## Run all validation checks
 
-# Code quality targets
+# Lint targets
 lint: ## Run linter (includes formatting)
 	golangci-lint run --timeout=5m
 
 lint-fix: ## Run linter with auto-fix (includes formatting)
 	golangci-lint run --fix --timeout=5m
 
 # Combined targets
-check: lint validate test ## Run all checks (lint, validate, test)
-
-pre-commit: check integration-test ## Run all pre-commit checks
-	@echo "All pre-commit checks passed!"
+check: lint validate test-all ## Run all checks (lint, validate, unit tests)
+	@echo "All checks passed!"
 
 # Development targets
-dev-compose: ## Start development environment with Docker Compose
-	docker compose up
+dev-compose: ## Start development environment with Docker Compose (builds image automatically)
+	docker compose up --build
 
 dev-local: ## Run registry locally (requires MongoDB)
 	go run cmd/registry/main.go
 
 # Cleanup
 clean: ## Clean build artifacts and coverage files
 	rm -f registry
-	rm -f coverage.out
+	rm -f coverage.out coverage.html
 	cd tools/publisher && rm -f publisher
 
-# Coverage
-coverage: ## Generate test coverage report
-	go test -v -race -coverprofile=coverage.out -covermode=atomic ./internal/...
 
 .DEFAULT_GOAL := help