Skip to content

Commit b349930

Browse files
committed
CI (self-hosted): Adjust for AlmaLinux 10
1 parent f1e6928 commit b349930

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/build-rpi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ jobs:
7070
runs-on: ubuntu-24.04
7171
permissions:
7272
actions: write
73-
# Skip if 8 and GPT or Kitten and MBR
74-
if: ${{ ( inputs.gpt && inputs.version_major != '8' || inputs.mbr && inputs.version_major != '10-kitten' ) && ( inputs.console || inputs.gnome ) && ( inputs.mbr || inputs.gpt ) }}
73+
# Skip if 8-GPT, 10-Kitten-MBR, 10-MBR
74+
if: ${{ ( inputs.gpt && inputs.version_major != '8' ) || ( inputs.mbr && inputs.version_major != '10-kitten' && inputs.version_major != '10' ) && ( inputs.console || inputs.gnome ) && ( inputs.mbr || inputs.gpt ) }}
7575
strategy:
7676
fail-fast: false
7777
matrix:
@@ -103,7 +103,7 @@ jobs:
103103
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
104104
aws_region: ${{ secrets.AWS_REGION }}
105105
# TODO: EC2_AMI_ID_AL9 (9-th AMI) should be used for Kitten 10 until appliance-tools isn't available
106-
ec2_ami_id: ${{ secrets[format('EC2_AMI_ID_AL{0}', ( inputs.version_major == '10-kitten' && '9' || inputs.version_major ))] }}
106+
ec2_ami_id: ${{ secrets[format('EC2_AMI_ID_AL{0}', ( ( inputs.version_major == '10-kitten' || inputs.version_major == '10' ) && '9' || inputs.version_major ))] }}
107107
ec2_subnet_id: ${{ secrets.EC2_SUBNET_ID}}
108108
ec2_security_group_id: ${{ secrets.EC2_SECURITY_GROUP_ID }}
109109

0 commit comments

Comments
 (0)