🔧 refactor: replace 4 workflows with single optimized ci-cd.yaml (closes #2)

.gitea/workflows/ci-cd.yaml

@@ -1,15 +1,28 @@
 ---
-# DanceLessonsCoach Optimized Main Branch Workflow
-# Fast, efficient CI/CD with artifact sharing for main branch
-# Combines testing, version management, and Docker publishing
+# DanceLessonsCoach Unified CI/CD Workflow
+# Single, optimized workflow that replaces all previous workflows
+# Fast execution with minimal repetition and maximum artifact sharing
 
-name: Main Branch CI/CD (Optimized)
+name: CI/CD Pipeline
 
 on:
   workflow_dispatch: {}
   push:
     branches:
       - main
+      - 'ci/**'
+      - 'feature/**'
+      - 'fix/**'
+      - 'refactor/**'
+    paths-ignore:
+      - 'README.md'
+      - 'doc/**'
+      - 'adr/**'
+      - '.gitea/**'
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize, reopened, labeled]
     paths-ignore:
       - 'README.md'
       - 'doc/**'
@@ -30,10 +43,10 @@ env:
   CI_REGISTRY: "gitea.arcodange.lab"
 
 jobs:
-  build-test:
-    name: Build and Test
+  ci-pipeline:
+    name: CI Pipeline
     runs-on: ubuntu-latest
-
+    
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -47,7 +60,8 @@ jobs:
       - name: Install dependencies
         run: go mod tidy
 
-      - name: Install swag
+      # SINGLE swag installation - reused for all steps
+      - name: Install swag (once)
         run: go install github.com/swaggo/swag/cmd/swag@latest
 
       - name: Generate Swagger Docs
@@ -59,6 +73,12 @@ jobs:
       - name: Run tests with coverage
         run: go test ./... -cover -v
 
+      - name: Run go fmt
+        run: go fmt ./...
+
+      - name: Run swag fmt
+        run: swag fmt
+
       - name: Build binaries
         run: ./scripts/build.sh
 
@@ -69,80 +89,20 @@ jobs:
           path: bin/
           retention-days: 1
 
-  lint-format:
-    name: Lint and Format
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-
-      - name: Install swag
-        run: go install github.com/swaggo/swag/cmd/swag@latest
-
-      - name: Run go fmt
-        run: go fmt ./...
-
-      - name: Run swag fmt
-        run: swag fmt
-
-      - name: Check for formatting issues
-        run: |
-          if [ -n "$(go fmt ./...)" ]; then
-            echo "❌ Formatting issues found"
-            exit 1
-          fi
-          echo "✅ Code is properly formatted"
-
-  version-management:
-    name: Version Management and Docker Build
-    runs-on: ubuntu-latest
-    needs: [build-test, lint-format]
-    if: github.ref == 'refs/heads/main'
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: build-artifacts
-          path: bin/
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-
-      - name: Install swag (if needed)
-        run: |
-          if [ ! -f pkg/server/docs/swagger.json ]; then
-            echo "📝 Generating Swagger documentation..."
-            go install github.com/swaggo/swag/cmd/swag@latest
-            cd pkg/server && go generate
-            echo "✅ Swagger documentation generated"
-          else
-            echo "✅ Swagger documentation already exists, skipping generation"
-          fi
-
-      - name: Analyze commit and bump version if needed
-        id: version-bump
+      # Version management and Docker build (main branch only)
+      - name: Version management and Docker build
+        if: github.ref == 'refs/heads/main'
         run: |
           # Analyze last commit message
           LAST_COMMIT=$(git log -1 --pretty=%B | head -1)
           VERSION_BUMPED="false"
           
-          if echo "$LAST_COMMIT" | grep -q "^feat:"; then
+          # Automatic version bump based on commit type
+          if echo "$LAST_COMMIT" | grep -q "^✨ feat:"; then
             echo "🎯 Feature commit detected - bumping MINOR version"
             ./scripts/version-bump.sh minor
             VERSION_BUMPED="true"
-          elif echo "$LAST_COMMIT" | grep -q "^fix:"; then
+          elif echo "$LAST_COMMIT" | grep -q "^🐛 fix:"; then
             echo "🐛 Fix commit detected - bumping PATCH version"
             ./scripts/version-bump.sh patch
             VERSION_BUMPED="true"
@@ -159,18 +119,17 @@ jobs:
           NEW_VERSION="$MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
           sed -i "s|// @version [0-9.]*|// @version $NEW_VERSION|" cmd/server/main.go
           
-          echo "version_bumped=$VERSION_BUMPED" >> $GITHUB_OUTPUT
-
-      - name: Commit version changes if bumped
-        if: steps.version-bump.outputs.version_bumped == 'true'
-        run: |
-          git config --global user.name "CI Bot"
-          git config --global user.email "ci@arcodange.fr"
-          git add VERSION cmd/server/main.go
-          git commit -m "chore: auto version bump [skip ci]" || echo "No changes to commit"
-          git push
+          # Commit version changes if bumped
+          if [ "$VERSION_BUMPED" = "true" ]; then
+            git config --global user.name "CI Bot"
+            git config --global user.email "ci@arcodange.fr"
+            git add VERSION cmd/server/main.go
+            git commit -m "chore: auto version bump [skip ci]" || echo "No changes to commit"
+            git push
+          fi
 
       - name: Login to Gitea Container Registry
+        if: github.ref == 'refs/heads/main'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.CI_REGISTRY }}
@@ -178,11 +137,12 @@ jobs:
           password: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Set up Docker Buildx
+        if: github.ref == 'refs/heads/main'
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push Docker image
+        if: github.ref == 'refs/heads/main'
         run: |
-          # Determine tags based on event type
           source VERSION
           IMAGE_VERSION="$MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
           
@@ -198,6 +158,7 @@ jobs:
           done
 
       - name: Show published images
+        if: github.ref == 'refs/heads/main'
         run: |
           source VERSION
           IMAGE_VERSION="$MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"

.gitea/workflows/dockerimage.yaml

@@ -1,140 +0,0 @@
----
-# DanceLessonsCoach Docker Image Build Workflow
-# Based on Arcodange webapp conventions
-# Builds and publishes Docker images to Gitea Container Registry
-
-name: Docker Build and Publish
-
-on:
-  workflow_dispatch: {}
-  push:
-    branches:
-      - main
-    tags:
-      - 'v*.*.*'
-    paths-ignore:
-      - 'README.md'
-      - 'doc/**'
-      - 'adr/**'
-      - '.gitea/**'
-
-# cancel any previously-started, yet still active runs of this workflow on the same branch
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-# Arcodange-specific environment variables
-env:
-  GITEA_INTERNAL: "https://gitea.arcodange.lab/"
-  GITEA_EXTERNAL: "https://gitea.arcodange.fr/"
-  GITEA_ORG: "arcodange"
-  GITEA_REPO: "DanceLessonsCoach"
-  CI_REGISTRY: "gitea.arcodange.lab"
-
-jobs:
-  version-bump:
-    name: Version Bump
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-          
-      - name: Install swag and generate Swagger Docs
-        run: |
-          if [ ! -f pkg/server/docs/swagger.json ]; then
-            echo "📝 Generating Swagger documentation..."
-            go install github.com/swaggo/swag/cmd/swag@latest
-            cd pkg/server && go generate
-            echo "✅ Swagger documentation generated"
-          else
-            echo "✅ Swagger documentation already exists, skipping generation"
-          fi
-        
-      - name: Bump version based on commit type
-        run: |
-          # Analyze last commit message
-          LAST_COMMIT=$(git log -1 --pretty=%B | head -1)
-          
-          if echo "$LAST_COMMIT" | grep -q "^feat:"; then
-            echo "🎯 Feature commit detected - bumping MINOR version"
-            ./scripts/version-bump.sh minor
-          elif echo "$LAST_COMMIT" | grep -q "^fix:"; then
-            echo "🐛 Fix commit detected - bumping PATCH version"
-            ./scripts/version-bump.sh patch
-          elif echo "$LAST_COMMIT" | grep -q "BREAKING CHANGE"; then
-            echo "💥 Breaking change detected - bumping MAJOR version"
-            ./scripts/version-bump.sh major
-          else
-            echo "⏭️  No automatic version bump needed"
-            # Still ensure swagger version is updated
-            source VERSION
-            NEW_VERSION="$MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
-            sed -i "s|// @version [0-9.]*|// @version $NEW_VERSION|" cmd/server/main.go
-          fi
-          
-      - name: Commit version changes
-        run: |
-          git config --global user.name "CI Bot"
-          git config --global user.email "ci@arcodange.fr"
-          git add VERSION cmd/server/main.go
-          git commit -m "chore: auto version bump [skip ci]" || echo "No changes to commit"
-          git push
-  
-  build-and-push-image:
-    name: Build and Push Docker Image
-    runs-on: ubuntu-latest
-    needs: version-bump
-    if: always() && (needs.version-bump.result == 'success' || needs.version-bump.result == 'skipped')
-    
-    steps:
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.CI_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.PACKAGES_TOKEN }}
-      
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      
-      - name: Build and push image to Gitea Container Registry
-        run: |-
-          # Determine tags based on event type
-          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            # For tags, use the tag name and latest
-            TAGS="${{ github.ref_name }} latest"
-          else
-            # For main branch, use commit SHA and latest
-            TAGS="latest ${{ github.sha }}"
-          fi
-          
-          echo "Building Docker image with tags: $TAGS"
-          docker build -t dance-lessons-coach .
-          
-          for TAG in $TAGS; do
-            IMAGE_NAME="${{ env.CI_REGISTRY }}/${{ env.GITEA_ORG }}/${{ env.GITEA_REPO }}:$TAG"
-            echo "Tagging and pushing: $IMAGE_NAME"
-            docker tag dance-lessons-coach "$IMAGE_NAME"
-            docker push "$IMAGE_NAME"
-          done
-      
-      - name: Show published images
-        run: |-
-          echo "📦 Published Docker images:"
-          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            echo "  - ${{ env.CI_REGISTRY }}/${{ env.GITEA_ORG }}/${{ env.GITEA_REPO }}:${{ github.ref_name }}"
-            echo "  - ${{ env.CI_REGISTRY }}/${{ env.GITEA_ORG }}/${{ env.GITEA_REPO }}:latest"
-          else
-            echo "  - ${{ env.CI_REGISTRY }}/${{ env.GITEA_ORG }}/${{ env.GITEA_REPO }}:latest"
-            echo "  - ${{ env.CI_REGISTRY }}/${{ env.GITEA_ORG }}/${{ env.GITEA_REPO }}:${{ github.sha }}"
-          fi

.gitea/workflows/go-ci-cd.yaml

@@ -1,145 +0,0 @@
----
-# DanceLessonsCoach CI/CD Pipeline for Arcodange Gitea
-# Follows Arcodange conventions from webapp workflow
-# Uses .gitea/workflows/ directory and internal registry
-
-name: Go CI/CD Pipeline
-
-on:
-  workflow_dispatch: {}
-  push:
-    branches:
-      - main
-      - 'ci/**'
-      - 'feature/**'
-      - 'fix/**'
-      - 'refactor/**'
-    paths-ignore:
-      - 'README.md'
-      - 'doc/**'
-      - 'adr/**'
-      - '.gitea/**'
-  pull_request:
-    branches:
-      - main
-    types: [opened, synchronize, reopened, labeled]
-    paths-ignore:
-      - 'README.md'
-      - 'doc/**'
-      - 'adr/**'
-      - '.gitea/**'
-
-# cancel any previously-started runs of this workflow on the same branch
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-# Arcodange-specific environment variables
-env:
-  GITEA_INTERNAL: "https://gitea.arcodange.lab/"
-  GITEA_EXTERNAL: "https://gitea.arcodange.fr/"
-  GITEA_ORG: "arcodange"
-  GITEA_REPO: "DanceLessonsCoach"
-  CI_REGISTRY: "gitea.arcodange.lab"
-
-jobs:
-  build-test:
-    name: Build and Test
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-          cache: true
-
-      - name: Install dependencies
-        run: go mod tidy
-
-      - name: Install swag
-        run: go install github.com/swaggo/swag/cmd/swag@latest
-
-      - name: Generate Swagger Docs
-        run: cd pkg/server && go generate
-
-      - name: Build all packages
-        run: go build ./...
-
-      - name: Run tests with coverage
-        run: go test ./... -cover -v
-
-      - name: Build binaries
-        run: ./scripts/build.sh
-
-      - name: List artifacts
-        run: ls -la bin/
-
-  lint-format:
-    name: Lint and Format
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-
-      - name: Install swag
-        run: go install github.com/swaggo/swag/cmd/swag@latest
-
-      - name: Run go fmt
-        run: go fmt ./...
-
-      - name: Run swag fmt
-        run: swag fmt
-
-      - name: Check for formatting issues
-        run: |
-          if [ -n "$(go fmt ./...)" ]; then
-            echo "❌ Formatting issues found"
-            exit 1
-          fi
-          echo "✅ Code is properly formatted"
-
-  version-check:
-    name: Version Management
-    runs-on: ubuntu-latest
-    needs: [build-test, lint-format]
-    if: github.ref == 'refs/heads/main'
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Show current version
-        run: |
-          source VERSION
-          echo "Version: $MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
-          echo "GITEA_REPO=$GITEA_ORG/$GITEA_REPO" >> $GITHUB_ENV
-
-      - name: Check for version bump candidates
-        run: |
-          echo "📋 Last commit analysis:"
-          git log -1 --pretty=%B | head -1
-
-          if git log -1 --pretty=%B | grep -q "^feat:"; then
-            echo "🎯 Feature commit detected - consider MINOR version bump"
-          elif git log -1 --pretty=%B | grep -q "^fix:"; then
-            echo "🐛 Fix commit detected - consider PATCH version bump"
-          elif git log -1 --pretty=%B | grep -q "BREAKING CHANGE"; then
-            echo "💥 Breaking change detected - consider MAJOR version bump"
-          else
-            echo "⏭️  No automatic version bump needed"
-          fi

.gitea/workflows/test-local-ci-cd.yaml

@@ -1,156 +0,0 @@
----
-# Local CI/CD Testing Workflow
-# Simulates the CI/CD pipeline but builds Docker image locally
-# Use this for local development and testing
-
-name: Local CI/CD Test
-
-on:
-  workflow_dispatch: {}
-  push:
-    branches:
-      - 'test/**'
-      - 'feature/**'
-    paths-ignore:
-      - 'README.md'
-      - 'doc/**'
-      - 'adr/**'
-      - '.gitea/**'
-
-# Arcodange-specific environment variables
-env:
-  GITEA_INTERNAL: "https://gitea.arcodange.lab/"
-  GITEA_EXTERNAL: "https://gitea.arcodange.fr/"
-  GITEA_ORG: "arcodange"
-  GITEA_REPO: "DanceLessonsCoach"
-  CI_REGISTRY: "gitea.arcodange.lab"
-
-jobs:
-  local-test:
-    name: Local CI/CD Test
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.26.1'
-          cache: true
-          
-      - name: Install dependencies
-        run: go mod tidy
-        
-      - name: Install swag
-        run: go install github.com/swaggo/swag/cmd/swag@latest
-        
-      - name: Generate Swagger Docs
-        run: cd pkg/server && go generate
-        
-      - name: Build all packages
-        run: go build ./...
-        
-      - name: Run tests with coverage
-        run: go test ./... -cover -v
-        
-      - name: Build binaries
-        run: ./scripts/build.sh
-        
-      - name: List artifacts
-        run: ls -la bin/
-        
-      - name: Version Bump Simulation
-        run: |
-          echo "📋 Simulating version bump based on commit type..."
-          LAST_COMMIT=$(git log -1 --pretty=%B | head -1)
-          echo "Last commit: $LAST_COMMIT"
-          
-          if echo "$LAST_COMMIT" | grep -q "^feat:"; then
-            echo "🎯 Feature commit detected - would bump MINOR version"
-            echo "Run: ./scripts/version-bump.sh minor"
-          elif echo "$LAST_COMMIT" | grep -q "^fix:"; then
-            echo "🐛 Fix commit detected - would bump PATCH version"
-            echo "Run: ./scripts/version-bump.sh patch"
-          elif echo "$LAST_COMMIT" | grep -q "BREAKING CHANGE"; then
-            echo "💥 Breaking change detected - would bump MAJOR version"
-            echo "Run: ./scripts/version-bump.sh major"
-          else
-            echo "⏭️  No automatic version bump needed"
-          fi
-          
-          # Show current version
-          source VERSION
-          echo "📊 Current version: $MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
-          
-      - name: Local Docker Build Instructions
-        run: |
-          echo "🐳 LOCAL DOCKER BUILD INSTRUCTIONS"
-          echo "================================"
-          echo ""
-          
-          # Get current version
-          source VERSION
-          CURRENT_VERSION="$MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
-          
-          echo "1. Build Docker image locally:"
-          echo "   docker build -t dance-lessons-coach:$CURRENT_VERSION ."
-          echo ""
-          
-          echo "2. Tag the image:"
-          echo "   docker tag dance-lessons-coach:$CURRENT_VERSION dance-lessons-coach:latest"
-          echo ""
-          
-          echo "3. Test the local image:"
-          echo "   docker run -p 8080:8080 dance-lessons-coach:$CURRENT_VERSION"
-          echo ""
-          
-          echo "4. Test API endpoints:"
-          echo "   curl http://localhost:8080/api/health"
-          echo "   curl http://localhost:8080/api/v1/greet/YourName"
-          echo ""
-          
-          echo "5. Clean up:"
-          echo "   docker stop <container_id> && docker rm <container_id>"
-          echo ""
-          
-          echo "💡 Tip: Use 'docker images' to see your built images"
-          echo "💡 Use 'docker ps' to see running containers"
-          
-      - name: Show Swagger UI Access
-        run: |
-          echo "📖 SWAGGER UI ACCESS"
-          echo "===================="
-          echo ""
-          echo "After starting the container, access Swagger UI at:"
-          echo "  http://localhost:8080/swagger/"
-          echo ""
-          echo "Swagger JSON spec available at:"
-          echo "  http://localhost:8080/swagger/doc.json"
-          echo ""
-          echo "Generated Swagger files:"
-          ls -la pkg/server/docs/ 2>/dev/null || echo "  (Swagger docs will be generated during Docker build)"
-          
-      - name: Test Summary
-        run: |
-          echo "✅ LOCAL CI/CD TEST COMPLETE"
-          echo "============================"
-          echo ""
-          echo "📋 What was tested:"
-          echo "  ✅ Go dependencies installation"
-          echo "  ✅ Swagger documentation generation"
-          echo "  ✅ Code compilation"
-          echo "  ✅ Unit tests with coverage"
-          echo "  ✅ Binary build"
-          echo "  ✅ Version bump simulation"
-          echo ""
-          echo "🐳 Next steps:"
-          echo "  1. Build Docker image locally (see instructions above)"
-          echo "  2. Test the container"
-          echo "  3. Verify API endpoints"
-          echo "  4. Test Swagger UI"
-          echo ""
-          echo "🎯 When ready for production:"
-          echo "  Push to main branch to trigger full CI/CD pipeline"
-          echo "  Docker image will be built and pushed to Gitea Container Registry"