Redis 8.0.1 (#15)

* Fix S3 Packages Issue #13
* Bump redis version

Author: adamiBs

.github/workflows/publish_unstable_package.yaml

@@ -9,7 +9,7 @@ on:
       - release/8.0
 
 env:
-  VERSION: "8.0.0"
+  VERSION: "8.0.1"
 
 jobs:
   build-containers:
@@ -39,7 +39,7 @@ jobs:
             version: 8
           - name: rockylinux
             version: 9
-    
+
     container:
       image: ghcr.io/${{ github.repository }}/builder:${{ matrix.os.name }}${{ matrix.os.version }}
       credentials:
@@ -102,11 +102,11 @@ jobs:
           - distro: quay.io/centos/centos
             distro_version: 8
         platform: [amd64, arm64]
-        distro: 
+        distro:
           - rockylinux
           - almalinux
           - quay.io/centos/centos
-        distro_version: 
+        distro_version:
           - 8
           - 9
 
@@ -129,7 +129,7 @@ jobs:
 
           # Download systemctl replacement first as .py file
           curl -L https://raw.githubusercontent.com/gdraheim/docker-systemctl-replacement/master/files/docker/systemctl3.py -o /usr/bin/systemctl3.py
-          
+
           # Handle Python interpreter path based on distribution
           if [ "${{ matrix.distro }}" = "quay.io/centos/centos" ] && [ "${{ matrix.distro_version }}" = "8" ]; then
             # CentOS 8 uses platform-python
@@ -138,10 +138,10 @@ jobs:
             # Other distributions use regular python3
             pythonpath="/usr/bin/python3"
           fi
-          
+
           echo "Using Python interpreter: $pythonpath"
           sed -i -e "s|/usr/bin/python3|$pythonpath|" /usr/bin/systemctl3.py
-          
+
           # Copy to final location after modification
           cp /usr/bin/systemctl3.py /usr/bin/systemctl
           chmod +x /usr/bin/systemctl
@@ -154,7 +154,7 @@ jobs:
         run: |
           sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
           sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
-  
+
       - name: Install RPM dependencies
         run: |
           dnf install -y ./rpm/*.rpm || true
@@ -165,7 +165,7 @@ jobs:
         run: |
           for i in {1..5}; do redis-cli ping &>/dev/null && break || echo "Waiting for Redis... $i" && sleep 1; done
           redis-cli info server || { echo "Cannot get server info"; exit 1; }
-      
+
       - name: Verify installed modules
         run: |
           modules=$(redis-cli module list)
@@ -234,13 +234,11 @@ jobs:
             exit 1
           fi
 
-  upload-rpm:
-    name: Upload RPM to S3
+  download-rpms:
+    name: Download RPM Artifacts
     needs: test-rpm
     if: github.ref == 'refs/heads/release/8.0'
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write
     strategy:
       fail-fast: false
       matrix:
@@ -254,7 +252,37 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: redis-${{ matrix.os.version }}-${{ matrix.platform }}-rpm
-          path: s3uploads
+          path: rpms/${{ matrix.os.name }}${{ matrix.os.version }}/${{ matrix.platform }}
+
+      - name: Upload RPM directory for further processing
+        uses: actions/upload-artifact@v4
+        with:
+          name: redis-${{ matrix.os.name }}${{ matrix.os.version }}-${{ matrix.platform }}-for-repo
+          path: rpms
+          retention-days: 1
+
+  upload-rpm:
+    name: Upload RPM to S3
+    needs: download-rpms
+    if: github.ref == 'refs/heads/release/8.0'
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - name: rockylinux
+            version: 8
+          - name: rockylinux
+            version: 9
+    steps:
+      - name: Download all RPM artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: redis-${{ matrix.os.name }}${{ matrix.os.version }}-*-for-repo
+          path: combined-rpms
+          merge-multiple: true
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -284,12 +312,14 @@ jobs:
           KEYGRIP=$(gpg --list-keys --with-keygrip | grep Keygrip | head -n1 | awk '{print $3}')
           echo "KEYGRIP=$KEYGRIP" >> $GITHUB_OUTPUT
 
-      - name: Sign RPM packages
+      - name: Install required tools
         run: |
           # Install required tools
           sudo apt-get update
           sudo apt-get install -y rpm createrepo-c s3cmd
 
+      - name: Sign RPM packages
+        run: |
           # Export and import GPG key for RPM
           gpg --export -a "${{ steps.gpg_email.outputs.GPG_EMAIL }}" > rpm-gpg-key.asc
           sudo rpm --import rpm-gpg-key.asc
@@ -298,20 +328,49 @@ jobs:
           mkdir -p ~/.gnupg
           echo "allow-preset-passphrase" > ~/.gnupg/gpg-agent.conf
           gpg-connect-agent reloadagent /bye
-          
+
           # Preset passphrase for non-interactive signing
           /usr/lib/gnupg/gpg-preset-passphrase -P "${{ secrets.GPG_PASSWORD }}" -c "${{ steps.gpg_keygrip.outputs.KEYGRIP }}"
-          
-          # Sign all RPM packages
-          cd s3uploads
-          find . -name "*.rpm" -exec rpmsign --addsign --key-id "${{ steps.gpg_id.outputs.GPG_ID }}" {} \;
-          
-          # Create repository metadata with signatures
+
+          # Sign new RPM packages before copying them to the final repository
+          echo "Signing new RPM packages..."
+          find combined-rpms/rpms/${{ matrix.os.name }}${{ matrix.os.version }} -name "*.rpm" -exec rpmsign --addsign --key-id "${{ steps.gpg_id.outputs.GPG_ID }}" {} \;
+
+          echo "Signed packages:"
+          find combined-rpms/rpms/${{ matrix.os.name }}${{ matrix.os.version }} -name "*.rpm" | sort
+
+      - name: Prepare repository structure
+        env:
+          RPM_S3_BUCKET: ${{ secrets.RPM_S3_BUCKET }}
+          RPM_S3_REGION: ${{ secrets.RPM_S3_REGION }}
+        run: |
+          # Create directory for the final repository
+          mkdir -p s3uploads/${{ matrix.os.name }}${{ matrix.os.version }}
+
+          # First download existing packages from S3 to ensure we include them in the repo metadata
+          echo "Downloading existing packages from S3..."
+          s3cmd sync --region=${{ env.RPM_S3_REGION }} s3://${{ env.RPM_S3_BUCKET }}/rpm/${{ matrix.os.name }}${{ matrix.os.version }}/ s3uploads/${{ matrix.os.name }}${{ matrix.os.version }}/
+
+          # Copy all signed RPMs from both architectures to the repository directory
+          echo "Adding newly signed packages..."
+          cp -r combined-rpms/rpms/${{ matrix.os.name }}${{ matrix.os.version }}/* s3uploads/${{ matrix.os.name }}${{ matrix.os.version }}/
+
+          # List all files to verify
+          echo "All packages in repository:"
+          find s3uploads -type f -name "*.rpm" | sort
+
+          # Create repository metadata with signatures for this OS version
+          echo "Generating repository metadata..."
+          cd s3uploads/${{ matrix.os.name }}${{ matrix.os.version }}
           createrepo_c .
 
       - name: Update packages and publish to private repo
         env:
           RPM_S3_BUCKET: ${{ secrets.RPM_S3_BUCKET }}
           RPM_S3_REGION: ${{ secrets.RPM_S3_REGION }}
         run: |
-          s3cmd sync --acl-public --region=${{ env.RPM_S3_REGION }} s3uploads/* s3://${{ env.RPM_S3_BUCKET }}/rpm/${{ matrix.os.name }}${{ matrix.os.version }}/
+          # Use --no-delete-removed to ensure we don't delete any existing packages
+          echo "Uploading repository to S3..."
+          s3cmd sync --acl-public --no-delete-removed --region=${{ env.RPM_S3_REGION }} s3uploads/${{ matrix.os.name }}${{ matrix.os.version }}/* s3://${{ env.RPM_S3_BUCKET }}/rpm/${{ matrix.os.name }}${{ matrix.os.version }}/
+
+          echo "Repository update complete for ${{ matrix.os.name }}${{ matrix.os.version }}"