Merge pull request #474 from Peter-Sh/release/8.2

Release automation: release/8.2

Author: Peter-Sh

.github/actions/apply-docker-version/action.yml

@@ -0,0 +1,36 @@
+inputs:
+  release_tag:
+    description: 'Release tag to build'
+    required: true
+  release_version_branch:
+    description: 'Release version branch to commit to'
+    required: true
+
+outputs:
+  changed_files:
+    description: 'List of files that were modified'
+    value: ${{ steps.apply-version.outputs.changed_files }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout common functions
+      uses: actions/checkout@v4
+      with:
+        repository: redis-developer/redis-oss-release-automation
+        ref: main
+        path: redis-oss-release-automation
+
+    - name: Apply docker version
+      id: apply-version
+      shell: bash
+      run: |
+        ${{ github.action_path }}/apply-docker-version.sh ${{ inputs.release_tag }}
+
+    - name: Create verified commit
+      if: steps.apply-version.outputs.changed_files != ''
+      uses: iarekylew00t/verified-bot-commit@v1
+      with:
+        message: ${{ inputs.release_tag }}
+        files: ${{ steps.apply-version.outputs.changed_files }}
+        ref: ${{ inputs.release_version_branch }}

.github/actions/apply-docker-version/apply-docker-version.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+set -e
+
+# This script updates Redis version in Dockerfiles using environment variables
+# REDIS_ARCHIVE_URL and REDIS_ARCHIVE_SHA, then commits changes if any were made.
+
+# shellcheck disable=SC2034
+last_cmd_stdout=""
+# shellcheck disable=SC2034
+last_cmd_stderr=""
+# shellcheck disable=SC2034
+last_cmd_result=0
+# shellcheck disable=SC2034
+VERBOSITY=1
+
+
+
+SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )")"
+# shellcheck disable=SC1091
+. "$SCRIPT_DIR/../common/func.sh"
+
+source_helper_file helpers.sh
+
+# Input TAG is expected in $1
+TAG="$1"
+
+if [ -z "$TAG" ]; then
+    echo "Error: TAG is required as first argument"
+    exit 1
+fi
+
+# Check if required environment variables are set
+if [ -z "$REDIS_ARCHIVE_URL" ]; then
+    echo "Error: REDIS_ARCHIVE_URL environment variable is not set"
+    exit 1
+fi
+
+if [ -z "$REDIS_ARCHIVE_SHA" ]; then
+    echo "Error: REDIS_ARCHIVE_SHA environment variable is not set"
+    exit 1
+fi
+
+echo "TAG: $TAG"
+echo "REDIS_ARCHIVE_URL: $REDIS_ARCHIVE_URL"
+echo "REDIS_ARCHIVE_SHA: $REDIS_ARCHIVE_SHA"
+
+# Function to update Dockerfile
+update_dockerfile() {
+    local dockerfile="$1"
+    local updated=false
+
+    if [ ! -f "$dockerfile" ]; then
+        echo "Warning: $dockerfile not found, skipping"
+        return 1
+    fi
+
+    echo "Updating $dockerfile..."
+
+    # Update REDIS_DOWNLOAD_URL
+    if grep -q "^ENV REDIS_DOWNLOAD_URL=" "$dockerfile"; then
+        sed -i "s|^ENV REDIS_DOWNLOAD_URL=.*|ENV REDIS_DOWNLOAD_URL=$REDIS_ARCHIVE_URL|" "$dockerfile"
+    else
+        echo "Cannot update $dockerfile, ENV REDIS_DOWNLOAD_URL not found"
+        return 1
+    fi
+
+
+    # Update REDIS_DOWNLOAD_SHA
+    if grep -q "^ENV REDIS_DOWNLOAD_SHA=" "$dockerfile"; then
+        sed -i "s|^ENV REDIS_DOWNLOAD_SHA=.*|ENV REDIS_DOWNLOAD_SHA=$REDIS_ARCHIVE_SHA|" "$dockerfile"
+    else
+        echo "Cannot update $dockerfile, ENV REDIS_DOWNLOAD_SHA not found"
+        return 1
+    fi
+}
+
+docker_files=("debian/Dockerfile" "alpine/Dockerfile")
+# Track which files were modified
+changed_files=()
+
+for dockerfile in "${docker_files[@]}"; do
+    update_dockerfile "$dockerfile"
+done
+
+changed_files=($(git diff --name-only "${docker_files[@]}"))
+
+# Output the list of changed files for GitHub Actions
+if [ ${#changed_files[@]} -gt 0 ]; then
+    echo "Files were modified:"
+    printf '%s\n' "${changed_files[@]}"
+
+    # Set GitHub Actions output
+    changed_files_output=$(printf '%s\n' "${changed_files[@]}")
+    {
+        echo "changed_files<<EOF"
+        echo "$changed_files_output"
+        echo "EOF"
+    } >> "$GITHUB_OUTPUT"
+
+    echo "Changed files output set for next step"
+else
+    echo "No files were modified"
+    echo "changed_files=" >> "$GITHUB_OUTPUT"
+fi

.github/actions/build-and-tag-locally/action.yml

@@ -19,6 +19,9 @@ inputs:
   registry_repository:
     description: 'Repository to push the image to'
     required: false
+  release_tag:
+    description: 'Release tag to build'
+    required: false
 
 runs:
   using: "composite"
@@ -95,14 +98,14 @@ runs:
         load: true
         platforms: ${{ inputs.platform }}
         tags: ${{ github.sha }}:${{ steps.platform.outputs.display_name }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-from: type=gha,scope=${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}
+        cache-to: type=gha,mode=max,scope=${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}
 
     - name: Save image
       shell: bash
       run: |
         docker save -o /tmp/image-${{ steps.platform.outputs.display_name }}.tar ${{ github.sha }}:${{ steps.platform.outputs.display_name }}
-    
+
     - name: Upload image
       uses: actions/upload-artifact@v4
       with:
@@ -115,7 +118,7 @@ runs:
       if: ${{ contains(fromJSON('["amd64", "i386", "arm64"]'), steps.platform.outputs.display_name) }}
       run: |
         docker run -d --name sanity-test-${{ steps.platform.outputs.display_name }} ${{ github.sha }}:${{ steps.platform.outputs.display_name }}
-    
+
     - name: Container Logs
       if: ${{ contains(fromJSON('["amd64", "i386", "arm64"]'), steps.platform.outputs.display_name) }}
       shell: bash
@@ -128,7 +131,7 @@ runs:
       run: |
         docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli ping
         docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli info server
-  
+
     - name: Verify installed modules
       if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
       shell: bash
@@ -148,7 +151,7 @@ runs:
           echo "The following modules are missing: ${missing_modules[*]}"
           exit 1
         fi
-  
+
     - name: Test RedisBloom
       if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
       shell: bash
@@ -158,7 +161,7 @@ runs:
         [ "$(docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli BF.EXISTS popular_keys "redis:hash")" = "1" ] || { echo "RedisBloom test failed: 'redis:hash' not found"; exit 1; }
         [ "$(docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli BF.EXISTS popular_keys "redis:list")" = "0" ] || { echo "RedisBloom test failed: 'redis:list' found unexpectedly"; exit 1; }
         echo "RedisBloom test passed successfully"
-      
+
     - name: Test RediSearch
       if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
       shell: bash
@@ -224,12 +227,44 @@ runs:
         path: test/report-entrypoint.xml
         reporter: java-junit
 
+    - name: Format registry tag
+      id: format-registry-tag
+      shell: bash
+      run: |
+        printf "tag=%s:%s%s-%s-%s" \
+          "${{ inputs.registry_repository }}" \
+          "${{ inputs.release_tag != '' && format('{0}-', inputs.release_tag || '') }}" \
+          "${{ github.sha }}" \
+          "${{ inputs.distribution }}" \
+          "${{ steps.platform.outputs.display_name }}" \
+          | tr '[:upper:]' '[:lower:]' >> "$GITHUB_OUTPUT"
+
     - name: Push image
       uses: docker/build-push-action@v6
       if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
       with:
         context: ${{ inputs.distribution }}
         push: true
-        tags: ${{ inputs.registry_repository }}:${{ github.sha }}-${{ inputs.distribution }}
+        tags: ${{ steps.format-registry-tag.outputs.tag }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
+
+    - name: Save image URL to artifact
+      shell: bash
+      run: |
+        if [[ "${{ inputs.publish_image }}" == "true" && "${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}" == "true" ]]; then
+          # Create a file with the image URL for this specific build
+          mkdir -p /tmp/image-urls
+          echo "${{ steps.format-registry-tag.outputs.tag }}" > "/tmp/image-urls/${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}.txt"
+          echo "Image URL saved: ${{ steps.format-registry-tag.outputs.tag }}"
+        else
+          echo "Image not published for this platform/distribution combination"
+        fi
+
+    - name: Upload image URL artifact
+      uses: actions/upload-artifact@v4
+      if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
+      with:
+        name: image-url-${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}
+        path: /tmp/image-urls/${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}.txt
+        retention-days: 1