From 6a25664a64e5416011fc21643b8c96fc0e012719 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao <meta@almalinux.org>
Date: Mon, 18 May 2026 06:10:36 +0000
Subject: [PATCH 1/2] CI: update actions/upload-artifact v4 -> v7

to address Node 20 deprecation. While here, upload compressed images
directly since v7 supports uploading non-zip-archived artifacts.
---
 .github/workflows/build-rpi-github-hosted.yml | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-rpi-github-hosted.yml b/.github/workflows/build-rpi-github-hosted.yml
index c78ec27..35d1e39 100644
--- a/.github/workflows/build-rpi-github-hosted.yml
+++ b/.github/workflows/build-rpi-github-hosted.yml
@@ -401,11 +401,11 @@ jobs:
         sudo vagrant scp builder:${{ env.rpi_image_resultdir }}/${{ env.image_name }}.* .
 
     - name: Compress image
-      if: steps.create-image.outcome == 'success' && inputs.upload_to_s3
+      if: steps.create-image.outcome == 'success' 
       id: compress-image
       run: |
         # XZ default compression level is 6 (of 0-9)
-        ( [ "${{ inputs.upload_to_s3 }}" = "true" ] && xz -k -9 -e -T0 ${{ env.image_name }}.raw ) || true
+        xz -k -9 -e -T0 ${{ env.image_name }}.raw || true
 
     - name: Collect and compress logs, xml
       id: compress-logs
@@ -420,24 +420,23 @@ jobs:
         fi
 
         # XZ default compression level is 6 (of 0-9)
-        ( [ "${{ inputs.upload_to_s3 }}" = "true" ] && xz -k -9 -e -T0 ${{ env.image_name }}.log.tar ) || true
+        xz -k -9 -e -T0 ${{ env.image_name }}.log.tar || true
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       name: Store logs, xml as artifact
       id: logs-artifact
       if: success() || failure()
       with:
-        name: ${{ env.image_name }}.log.tar
-        path: ${{ env.image_name }}.log.tar
+        archive: false
+        path: ${{ env.image_name }}.log.tar.xz
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       name: Store image as artifact
       id: image-artifact
-      if: steps.create-image.outcome == 'success' && inputs.store_as_artifact
+      if: steps.create-image.outcome == 'success' 
       with:
-        name: "${{ env.image_name }}.raw"
-        compression-level: 1
-        path: ${{ env.image_name }}.raw
+        archive: false
+        path: ${{ env.image_name }}.raw.xz
 
     - name: Configure AWS credentials
       if: steps.compress-image.outcome == 'success' && inputs.upload_to_s3

From ebb496e460bf38fb9ebe59c6067b629fdcb66964 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao <meta@almalinux.org>
Date: Mon, 18 May 2026 06:27:40 +0000
Subject: [PATCH 2/2] CI: update actions for self-hosted CI as well

to address Node 20 deprecation. While here, upload non-zip-archived
artifacts directly.
---
 .github/workflows/build-rpi-github-hosted.yml |  2 +-
 .github/workflows/build-rpi.yml               | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-rpi-github-hosted.yml b/.github/workflows/build-rpi-github-hosted.yml
index 35d1e39..a2c8ca3 100644
--- a/.github/workflows/build-rpi-github-hosted.yml
+++ b/.github/workflows/build-rpi-github-hosted.yml
@@ -440,7 +440,7 @@ jobs:
 
     - name: Configure AWS credentials
       if: steps.compress-image.outcome == 'success' && inputs.upload_to_s3
-      uses: aws-actions/configure-aws-credentials@v4.0.2
+      uses: aws-actions/configure-aws-credentials@v6
       with:
         aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml
index e8bcc8c..60b6c16 100644
--- a/.github/workflows/build-rpi.yml
+++ b/.github/workflows/build-rpi.yml
@@ -95,7 +95,7 @@ jobs:
     steps:
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v4.0.2
+      uses: aws-actions/configure-aws-credentials@v6
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -118,7 +118,7 @@ jobs:
 
     - name: Setup and start the runner
       id: start-ec2-runner
-      uses: NextChapterSoftware/ec2-action-builder@v1.5
+      uses: unblocked/ec2-action-builder@v1.11
       with:
         github_token: ${{ secrets.GIT_HUB_TOKEN }}
         aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -166,7 +166,7 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       name: Checkout ${{ github.action_repository }}
 
     - name: Set environment variables
@@ -260,13 +260,13 @@ jobs:
           ${{ env.rpi_image_resultdir }}/${{ env.image_name }}/${{ env.image_name }}.raw
 
     - name: Compress image
-      if: steps.create-image.outcome == 'success' && inputs.upload_to_s3
+      if: steps.create-image.outcome == 'success'
       id: compress-image
       run: |
         cd ${{ env.rpi_image_resultdir }}/${{ env.image_name }}
 
         # XZ default compression level is 6 (of 0-9)
-        ( [ "${{ inputs.upload_to_s3 }}" = "true" ] && xz -k -9 -e -T0 ${{ env.image_name }}.raw ) || true
+        xz -k -9 -e -T0 ${{ env.image_name }}.raw || true
 
     - name: Collect and compress logs, xml
       id: compress-logs
@@ -282,28 +282,27 @@ jobs:
         fi
 
         # XZ default compression level is 6 (of 0-9)
-        ( [ "${{ inputs.upload_to_s3 }}" = "true" ] && xz -k -9 -e -T0 ${{ env.image_name }}.log.tar ) || true
+        xz -k -9 -e -T0 ${{ env.image_name }}.log.tar || true
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       name: Store logs, xml as artifact
       id: logs-artifact
       if: success() || failure()
       with:
-        name: ${{ env.image_name }}.log.tar
-        path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}.log.tar
+        archive: false
+        path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}.log.tar.xz
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       name: Store image as artifact
       id: image-artifact
       if: steps.create-image.outcome == 'success' && inputs.store_as_artifact
       with:
-        name: "${{ env.image_name }}.raw"
-        compression-level: 1
-        path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}/${{ env.image_name }}.raw
+        archive: false
+        path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}/${{ env.image_name }}.raw.xz
 
     - name: Configure AWS credentials
       if: steps.compress-image.outcome == 'success' && inputs.upload_to_s3
-      uses: aws-actions/configure-aws-credentials@v4.0.2
+      uses: aws-actions/configure-aws-credentials@v6
       with:
         aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}