Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: rework build image selection #652

Merged
merged 2 commits into from
Sep 14, 2024
Merged

CI: rework build image selection #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00b65b0
CI: Enable building of the images with and without initramfs
quic-vkraleti Sep 13, 2024
3c5a909
CI: manually specify build matrix
lumag Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .github/workflows/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
machines:
required: true
type: string
variants:
required: true
type: string
url:
required: true
type: string
Expand Down Expand Up @@ -78,6 +81,14 @@ jobs:
- PREFERRED_PROVIDER_virtual/kernel := 'linux-${kernel}'
- INITRAMFS_IMAGE ?= 'initramfs-rootfs-image'

${tclibc}-${kernel}-noinitramfs: &${tclibc}-${kernel}-noinitramfs
local_conf:
- INHERIT += 'buildstats buildstats-summary'
- INHERIT:remove = 'rm_work'
- TCLIBC := '${tclibc}'
- PREFERRED_PROVIDER_virtual/kernel := 'linux-${kernel}'
- INITRAMFS_IMAGE ?= ''

EOF
done
done
Expand All @@ -93,14 +104,12 @@ jobs:
bakes:
EOF
for machine in ${{inputs.machines}}; do
for variant in ${{inputs.variants}}; do
[ ${variant##${machine}-${tclibc}} == ${variant} ] && continue
cat << EOF >> plan.yaml
- { <<: [*commondata, *${tclibc}-linaro-qcomlt], machine: ${machine}, name: ${machine}-${tclibc} }
- { <<: [*commondata, *${variant#${machine}-}], machine: ${machine}, name: ${variant} }
EOF
if [ "${machine}" = "qcom-armv8a" -a "${{inputs.branch}}" = "master" ] ; then
cat << EOF >> plan.yaml
- { <<: [*commondata, *${tclibc}-yocto], machine: qcom-armv8a, name: qcom-armv8a-${tclibc}-yocto }
EOF
fi
done
done
done

Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ jobs:
host: debian-bookworm
images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-rootfs-image cryptodev-module esp-qcom-image
machines: qcom-armv8a qcom-armv7a-modem qcom-armv7a
variants: >-
qcom-armv8a-glibc-yocto qcom-armv8a-musl-yocto
qcom-armv7a-glibc-yocto qcom-armv7a-musl-yocto
qcom-armv7a-modem-glibc-linaro-qcomlt qcom-armv7a-modem-musl-linaro-qcomlt
qcom-armv8a-glibc-linaro-qcomlt
qcom-armv8a-glibc-yocto-noinitramfs
ref_type: branch
ref: master
branch: master
Expand All @@ -23,6 +29,12 @@ jobs:
host: debian-bookworm
images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-rootfs-image cryptodev-module esp-qcom-image
machines: qcom-armv8a qcom-armv7a-modem qcom-armv7a
variants: >-
qcom-armv8a-glibc-yocto qcom-armv8a-musl-yocto
qcom-armv7a-glibc-yocto qcom-armv7a-musl-yocto
qcom-armv7a-modem-glibc-linaro-qcomlt qcom-armv7a-modem-musl-linaro-qcomlt
qcom-armv8a-glibc-linaro-qcomlt
qcom-armv8a-glibc-yocto-noinitramfs
ref_type: branch
ref: scarthgap
branch: scarthgap
Expand All @@ -35,6 +47,10 @@ jobs:
host: debian-bookworm
images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-rootfs-image cryptodev-module
machines: qcom-armv8a sdx55-mtp qcom-armv7a
variants: >-
qcom-armv8a-glibc-linaro-qcomlt qcom-armv8a-musl-linaro-qcomlt
qcom-armv7a-glibc-linaro-qcomlt qcom-armv7a-musl-linaro-qcomlt
sdx55-mtp-modem-glibc-linaro-qcomlt sdx55-mtp-modem-musl-linaro-qcomlt
ref_type: branch
ref: kirkstone
branch: kirkstone
Expand All @@ -47,6 +63,8 @@ jobs:
host: debian-bookworm
images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image cryptodev-module
machines: qcom-armv8a
variants: >-
qcom-armv8a-glibc-linaro-qcomlt qcom-armv8a-musl-linaro-qcomlt
ref_type: branch
ref: dunfell
branch: dunfell
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/premerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ jobs:
host: debian-bookworm
images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-rootfs-image cryptodev-module esp-qcom-image
machines: qcom-armv8a qcom-armv7a-modem qcom-armv7a
variants: >-
qcom-armv8a-glibc-yocto qcom-armv8a-musl-yocto
qcom-armv7a-glibc-yocto qcom-armv7a-musl-yocto
qcom-armv7a-modem-glibc-linaro-qcomlt qcom-armv7a-modem-musl-linaro-qcomlt
qcom-armv8a-glibc-linaro-qcomlt
qcom-armv8a-glibc-yocto-noinitramfs
ref: refs/pull/${{github.event.pull_request.number}}/merge
branch: ${{github.base_ref}}
url: ${{github.server_url}}/${{github.repository}}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ jobs:
host: debian-bookworm
images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-rootfs-image cryptodev-module
machines: qcom-armv8a qcom-armv7a-modem qcom-armv7a
variants: >-
qcom-armv8a-glibc-yocto qcom-armv8a-musl-yocto
qcom-armv7a-glibc-yocto qcom-armv7a-musl-yocto
qcom-armv7a-modem-glibc-linaro-qcomlt qcom-armv7a-modem-musl-linaro-qcomlt
qcom-armv8a-glibc-linaro-qcomlt
qcom-armv8a-glibc-yocto-noinitramfs
ref: ${{github.sha}}
ref_type: sha
branch: ${{github.ref_name}}
Expand Down