Update analytics-ci.yml

.github/workflows/analytics-ci.yml

@@ -16,110 +16,102 @@ on:
       - 'build.gradle'
       - 'settings.gradle'
   workflow_dispatch:
+
 env:
   ACR_NAME: acrdigitalgarage03
   IMAGE_NAME: hiorder/analytics
-
+  
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-
+    
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: '8.13'
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Check gradle wrapper files
-        run: |
-          echo "Checking gradle wrapper files..."
-          ls -la gradle/wrapper/
-          ls -la gradlew*
-          echo "Downloading gradle wrapper if needed..."
-          if [ ! -f "gradle/wrapper/gradle-wrapper.jar" ]; then
-            echo "gradle-wrapper.jar not found, generating wrapper..."
-            gradle wrapper --gradle-version 8.13
-          fi
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Verify gradle wrapper
-        run: |
-          echo "Testing gradle wrapper..."
-          ./gradlew --version
-
-      - name: Build common module
-        run: ./gradlew common:build -x test
-
-      - name: Build analytics module
-        run: ./gradlew analytics:build -x test
-
-      - name: Run analytics tests
-        run: ./gradlew analytics:test
-
-      - name: Generate build timestamp
-        id: timestamp
-        run: echo "BUILD_TIME=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Azure Container Registry
-        uses: azure/docker-login@v1
-        with:
-          login-server: ${{ env.ACR_NAME }}.azurecr.io
-          username: ${{ secrets.ACR_USERNAME }}
-          password: ${{ secrets.ACR_PASSWORD }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./analytics/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_NAME }}:${{ steps.timestamp.outputs.BUILD_TIME }}
-            ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_NAME }}:latest
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Output image tags
-        run: |
-          echo "🎉 Image pushed successfully!"
-          echo "📦 Image: ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_NAME }}"
-          echo "🏷️  Tags: ${{ steps.timestamp.outputs.BUILD_TIME }}, latest"
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: analytics-test-results
-          path: analytics/build/reports/tests/test/
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
-        if: success()
-        with:
-          name: analytics-jar
-          path: analytics/build/libs/*.jar
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+      with:
+        gradle-version: '8.13'
+        
+    - name: Cache Gradle packages
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+          
+    - name: Fix Gradle Wrapper
+      run: |
+        echo "Checking gradle wrapper files..."
+        if [ ! -f "gradle/wrapper/gradle-wrapper.jar" ]; then
+          echo "gradle-wrapper.jar not found, downloading..."
+          mkdir -p gradle/wrapper
+          curl -L -o gradle/wrapper/gradle-wrapper.jar \
+            "https://services.gradle.org/distributions/gradle-8.13-wrapper.jar"
+        fi
+        chmod +x gradlew
+        echo "Testing gradle wrapper..."
+        ./gradlew --version
+        
+    - name: Build analytics module with dependencies
+      run: ./gradlew analytics:build -x test
+      
+    - name: Run analytics tests
+      run: ./gradlew analytics:test
+      
+    - name: Generate build timestamp
+      id: timestamp
+      run: echo "BUILD_TIME=$(date +'%y%m%d%H%M')" >> $GITHUB_OUTPUT
+      
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      
+    - name: Log in to Azure Container Registry
+      uses: azure/docker-login@v1
+      with:
+        login-server: ${{ env.ACR_NAME }}.azurecr.io
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./analytics/Dockerfile
+        platforms: linux/amd64
+        push: true
+        tags: |
+          ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_NAME }}:${{ steps.timestamp.outputs.BUILD_TIME }}
+          ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_NAME }}:latest
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        
+    - name: Output image tags
+      run: |
+        echo "🎉 Image pushed successfully!"
+        echo "📦 Image: ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_NAME }}"
+        echo "🏷️  Tags: ${{ steps.timestamp.outputs.BUILD_TIME }}, latest"
+        
+    - name: Upload test results
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: analytics-test-results
+        path: analytics/build/reports/tests/test/
+        
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      if: success()
+      with:
+        name: analytics-jar
+        path: analytics/build/libs/*.jar