IONOS(build): enhance cache handling with optional version suffix and specific app rebuilds

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>

Author: printminion-co

.github/scripts/detect-app-cache.sh

@@ -17,7 +17,8 @@ set -o pipefail  # Exit if any command in pipeline fails
 : "${FORCE_REBUILD:?FORCE_REBUILD not set}"
 : "${ARTIFACTORY_REPOSITORY_SNAPSHOT:?ARTIFACTORY_REPOSITORY_SNAPSHOT not set}"
 
-# Optional JFrog variables
+# Optional variables
+APPS_TO_REBUILD="${APPS_TO_REBUILD:-}"
 JF_URL="${JF_URL:-}"
 JF_USER="${JF_USER:-}"
 JF_ACCESS_TOKEN="${JF_ACCESS_TOKEN:-}"
@@ -34,7 +35,11 @@ JF_ACCESS_TOKEN="${JF_ACCESS_TOKEN:-}"
 # - has_apps_to_restore: boolean flag
 
 echo "Collecting app SHAs and checking cache status..."
+echo "Cache version: $CACHE_VERSION"
 echo "Force rebuild mode: $FORCE_REBUILD"
+if [ -n "$APPS_TO_REBUILD" ]; then
+  echo "Apps to rebuild: $APPS_TO_REBUILD"
+fi
 echo ""
 
 # Setup JFrog CLI if credentials are available
@@ -92,17 +97,34 @@ echo ""
 
 echo "### 📦 Cache Status Report for ($GITHUB_REF)" >> "$GITHUB_STEP_SUMMARY"
 echo "" >> "$GITHUB_STEP_SUMMARY"
+echo "**Cache Version:** \`$CACHE_VERSION\`" >> "$GITHUB_STEP_SUMMARY"
+echo "" >> "$GITHUB_STEP_SUMMARY"
 if [ "$FORCE_REBUILD" == "true" ]; then
   echo "**🔄 FORCE REBUILD MODE ENABLED** - All caches bypassed" >> "$GITHUB_STEP_SUMMARY"
   echo "" >> "$GITHUB_STEP_SUMMARY"
 fi
+if [ -n "$APPS_TO_REBUILD" ]; then
+  echo "**🔨 Specific apps to rebuild:** \`$APPS_TO_REBUILD\`" >> "$GITHUB_STEP_SUMMARY"
+  echo "" >> "$GITHUB_STEP_SUMMARY"
+fi
 if [ "$JFROG_AVAILABLE" == "true" ]; then
   echo "**🎯 JFrog Artifact Cache**: Enabled for all branches" >> "$GITHUB_STEP_SUMMARY"
   echo "" >> "$GITHUB_STEP_SUMMARY"
 fi
 echo "| App | SHA | Cache Key | Status |" >> "$GITHUB_STEP_SUMMARY"
 echo "|-----|-----|-----------|--------|" >> "$GITHUB_STEP_SUMMARY"
 
+# Convert comma-separated apps list to array for easier checking
+if [ -n "$APPS_TO_REBUILD" ]; then
+  IFS=',' read -ra REBUILD_APPS_ARRAY <<< "$APPS_TO_REBUILD"
+  # Trim whitespace from each app name using xargs for readability
+  for i in "${!REBUILD_APPS_ARRAY[@]}"; do
+    REBUILD_APPS_ARRAY[$i]=$(echo "${REBUILD_APPS_ARRAY[$i]}" | xargs)
+  done
+else
+  REBUILD_APPS_ARRAY=()
+fi
+
 # Iterate through each app in the matrix
 while IFS= read -r app_json; do
   APP_NAME=$(echo "$app_json" | jq -r '.name')
@@ -148,6 +170,23 @@ while IFS= read -r app_json; do
     continue
   fi
 
+  # Check if this specific app should be rebuilt (ignore cache)
+  REBUILD_THIS_APP=false
+  for rebuild_app in "${REBUILD_APPS_ARRAY[@]}"; do
+    if [ "$APP_NAME" == "$rebuild_app" ]; then
+      REBUILD_THIS_APP=true
+      break
+    fi
+  done
+
+  if [ "$REBUILD_THIS_APP" == "true" ]; then
+    echo "🔨 rebuild requested"
+    echo "| $APP_NAME | \`$SHORT_SHA\` | \`$CACHE_KEY\` | 🔨 Rebuild requested |" >> "$GITHUB_STEP_SUMMARY"
+    APPS_TO_BUILD=$(echo "$APPS_TO_BUILD" | jq -c --arg app "$APP_NAME" --arg sha "$CURRENT_SHA" '. + [{name: $app, sha: $sha}]')
+    APPS_TO_BUILD_COUNT=$((APPS_TO_BUILD_COUNT + 1))
+    continue
+  fi
+
   # Check JFrog first before GitHub cache (available for all branches)
   if [ "$JFROG_AVAILABLE" == "true" ]; then
     JFROG_PATH="${ARTIFACTORY_REPOSITORY_SNAPSHOT}/apps/${CACHE_VERSION}/${APP_NAME}/${APP_NAME}-${CURRENT_SHA}.tar.gz"

.github/workflows/build-artifact.yml

@@ -38,6 +38,16 @@ on:
         required: false
         type: boolean
         default: false
+      cache_version_suffix:
+        description: 'Optional cache version suffix (e.g., "test", "debug") - creates separate cache namespace'
+        required: false
+        type: string
+        default: ''
+      apps_to_rebuild:
+        description: 'Comma-separated list of specific apps to rebuild (e.g., "app1,app2") - ignores cache for these apps only'
+        required: false
+        type: string
+        default: ''
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/ionos-dev' && github.run_id || github.event.pull_request.number || github.ref }}
@@ -66,7 +76,16 @@ jobs:
       apps_sha_map: ${{ steps.detect.outputs.apps_sha_map }}
       has_apps_to_build: ${{ steps.detect.outputs.has_apps_to_build }}
       has_apps_to_restore: ${{ steps.detect.outputs.has_apps_to_restore }}
+      effective_cache_version: ${{ steps.compute_cache_version.outputs.effective_cache_version }}
     steps:
+      - name: Compute effective cache version
+        id: compute_cache_version
+        run: |
+          # Compute cache version with optional suffix to create a single source of truth
+          EFFECTIVE_VERSION="${{ env.CACHE_VERSION }}${{ github.event.inputs.cache_version_suffix && format('-{0}', github.event.inputs.cache_version_suffix) || '' }}"
+          echo "effective_cache_version=$EFFECTIVE_VERSION" >> "$GITHUB_OUTPUT"
+          echo "Effective cache version: $EFFECTIVE_VERSION"
+
       - name: Checkout repository
         uses: actions/checkout@v5
         with:
@@ -182,14 +201,21 @@ jobs:
         id: detect
         env:
           GH_TOKEN: ${{ github.token }}
-          CACHE_VERSION: ${{ env.CACHE_VERSION }}
+          CACHE_VERSION: ${{ steps.compute_cache_version.outputs.effective_cache_version }}
           FORCE_REBUILD: ${{ github.event.inputs.force_rebuild || 'false' }}
+          APPS_TO_REBUILD: ${{ github.event.inputs.apps_to_rebuild || '' }}
           JF_URL: ${{ secrets.JF_ARTIFACTORY_URL }}
           JF_USER: ${{ secrets.JF_ARTIFACTORY_USER }}
           JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
           ARTIFACTORY_REPOSITORY_SNAPSHOT: ${{ env.ARTIFACTORY_REPOSITORY_SNAPSHOT }}
           GITHUB_REF: ${{ github.ref }}
         run: |
+          # Show effective cache version
+          echo "Base CACHE_VERSION: ${{ env.CACHE_VERSION }}"
+          echo "Cache version suffix: ${{ github.event.inputs.cache_version_suffix || '(none)' }}"
+          echo "Effective CACHE_VERSION: ${CACHE_VERSION}"
+          echo "Apps to rebuild: ${{ github.event.inputs.apps_to_rebuild || '(none)' }}"
+          echo ""
           bash .github/scripts/detect-app-cache.sh '${{ steps.set_matrix.outputs.matrix }}'
 
   build-external-apps:
@@ -287,7 +313,7 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: ${{ steps.app-config.outputs.path }}
-          key: ${{ env.CACHE_VERSION }}-app-build-${{ matrix.app_info.name }}-${{ matrix.app_info.sha }}
+          key: ${{ needs.prepare-matrix.outputs.effective_cache_version }}-app-build-${{ matrix.app_info.name }}-${{ matrix.app_info.sha }}
 
       # Push to JFrog for ionos-dev branch builds
       - name: Setup JFrog CLI
@@ -319,11 +345,15 @@ jobs:
           APP_SHA="${{ matrix.app_info.sha }}"
           APP_PATH="${{ steps.app-config.outputs.path }}"
 
+          # Use precomputed effective cache version
+          EFFECTIVE_CACHE_VERSION="${{ needs.prepare-matrix.outputs.effective_cache_version }}"
+
           echo "=== JFrog Upload Debug Info ==="
           echo "📦 Packaging $APP_NAME for JFrog upload..."
           echo "App Name: $APP_NAME"
           echo "App SHA: $APP_SHA"
           echo "App Path: $APP_PATH"
+          echo "Cache Version: $EFFECTIVE_CACHE_VERSION"
           echo "Repository: ${{ env.ARTIFACTORY_REPOSITORY_SNAPSHOT }}"
           echo "==============================="
 
@@ -355,7 +385,7 @@ jobs:
 
           # Upload to JFrog - store in snapshot repo under dev/apps/
           # Include CACHE_VERSION in path to enable complete cache invalidation
-          JFROG_PATH="${{ env.ARTIFACTORY_REPOSITORY_SNAPSHOT }}/apps/${{ env.CACHE_VERSION }}/${APP_NAME}/${ARCHIVE_NAME}"
+          JFROG_PATH="${{ env.ARTIFACTORY_REPOSITORY_SNAPSHOT }}/apps/${EFFECTIVE_CACHE_VERSION}/${APP_NAME}/${ARCHIVE_NAME}"
 
           # Build properties for artifact metadata
           JFROG_PROPS_LIST=()
@@ -1176,9 +1206,12 @@ jobs:
           echo ""
           echo "### Workflow Inputs (if workflow_dispatch)"
           echo "Force Rebuild: ${{ github.event.inputs.force_rebuild || 'N/A' }}"
+          echo "Cache Version Suffix: ${{ github.event.inputs.cache_version_suffix || 'N/A' }}"
+          echo "Apps to Rebuild: ${{ github.event.inputs.apps_to_rebuild || 'N/A' }}"
           echo ""
           echo "### Environment Variables"
-          echo "CACHE_VERSION: ${{ env.CACHE_VERSION }}"
+          echo "Base CACHE_VERSION: ${{ env.CACHE_VERSION }}"
+          echo "Effective CACHE_VERSION: ${{ needs.prepare-matrix.outputs.effective_cache_version }}"
           echo "TARGET_PACKAGE_NAME: ${{ env.TARGET_PACKAGE_NAME }}"
           echo "ARTIFACTORY_REPOSITORY_SNAPSHOT: ${{ env.ARTIFACTORY_REPOSITORY_SNAPSHOT }}"
           echo ""