Skip to content

Commit ebb496e

Browse files
committed
CI: update actions for self-hosted CI as well
to address Node 20 deprecation. While here, upload non-zip-archived artifacts directly.
1 parent 6a25664 commit ebb496e

2 files changed

Lines changed: 14 additions & 15 deletions

File tree

.github/workflows/build-rpi-github-hosted.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ jobs:
440440

441441
- name: Configure AWS credentials
442442
if: steps.compress-image.outcome == 'success' && inputs.upload_to_s3
443-
uses: aws-actions/configure-aws-credentials@v4.0.2
443+
uses: aws-actions/configure-aws-credentials@v6
444444
with:
445445
aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
446446
aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}

.github/workflows/build-rpi.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
steps:
9696

9797
- name: Configure AWS credentials
98-
uses: aws-actions/configure-aws-credentials@v4.0.2
98+
uses: aws-actions/configure-aws-credentials@v6
9999
with:
100100
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
101101
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -118,7 +118,7 @@ jobs:
118118
119119
- name: Setup and start the runner
120120
id: start-ec2-runner
121-
uses: NextChapterSoftware/ec2-action-builder@v1.5
121+
uses: unblocked/ec2-action-builder@v1.11
122122
with:
123123
github_token: ${{ secrets.GIT_HUB_TOKEN }}
124124
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -166,7 +166,7 @@ jobs:
166166

167167
steps:
168168

169-
- uses: actions/checkout@v4
169+
- uses: actions/checkout@v6
170170
name: Checkout ${{ github.action_repository }}
171171

172172
- name: Set environment variables
@@ -260,13 +260,13 @@ jobs:
260260
${{ env.rpi_image_resultdir }}/${{ env.image_name }}/${{ env.image_name }}.raw
261261
262262
- name: Compress image
263-
if: steps.create-image.outcome == 'success' && inputs.upload_to_s3
263+
if: steps.create-image.outcome == 'success'
264264
id: compress-image
265265
run: |
266266
cd ${{ env.rpi_image_resultdir }}/${{ env.image_name }}
267267
268268
# XZ default compression level is 6 (of 0-9)
269-
( [ "${{ inputs.upload_to_s3 }}" = "true" ] && xz -k -9 -e -T0 ${{ env.image_name }}.raw ) || true
269+
xz -k -9 -e -T0 ${{ env.image_name }}.raw || true
270270
271271
- name: Collect and compress logs, xml
272272
id: compress-logs
@@ -282,28 +282,27 @@ jobs:
282282
fi
283283
284284
# XZ default compression level is 6 (of 0-9)
285-
( [ "${{ inputs.upload_to_s3 }}" = "true" ] && xz -k -9 -e -T0 ${{ env.image_name }}.log.tar ) || true
285+
xz -k -9 -e -T0 ${{ env.image_name }}.log.tar || true
286286
287-
- uses: actions/upload-artifact@v4
287+
- uses: actions/upload-artifact@v7
288288
name: Store logs, xml as artifact
289289
id: logs-artifact
290290
if: success() || failure()
291291
with:
292-
name: ${{ env.image_name }}.log.tar
293-
path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}.log.tar
292+
archive: false
293+
path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}.log.tar.xz
294294

295-
- uses: actions/upload-artifact@v4
295+
- uses: actions/upload-artifact@v7
296296
name: Store image as artifact
297297
id: image-artifact
298298
if: steps.create-image.outcome == 'success' && inputs.store_as_artifact
299299
with:
300-
name: "${{ env.image_name }}.raw"
301-
compression-level: 1
302-
path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}/${{ env.image_name }}.raw
300+
archive: false
301+
path: ${{ env.rpi_image_resultdir }}/${{ env.image_name }}/${{ env.image_name }}.raw.xz
303302

304303
- name: Configure AWS credentials
305304
if: steps.compress-image.outcome == 'success' && inputs.upload_to_s3
306-
uses: aws-actions/configure-aws-credentials@v4.0.2
305+
uses: aws-actions/configure-aws-credentials@v6
307306
with:
308307
aws-access-key-id: ${{ secrets.S3_ACCESS_KEY_ID }}
309308
aws-secret-access-key: ${{ secrets.S3_SECRET_ACCESS_KEY }}

0 commit comments

Comments
 (0)