From c8db8b7994b74ff759381fee428743dc0d799fc4 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Tue, 10 Dec 2024 12:29:40 +0200 Subject: [PATCH] CI: provide variants for the CI setup Provide missing input for the CI. Signed-off-by: Dmitry Baryshkov --- .github/workflows/premerge.yml | 12 ++++++++++++ .github/workflows/push.yml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/workflows/premerge.yml b/.github/workflows/premerge.yml index 15f85d6e3..7a0a630e9 100644 --- a/.github/workflows/premerge.yml +++ b/.github/workflows/premerge.yml @@ -7,6 +7,7 @@ jobs: build: uses: ./.github/workflows/build-template.yml with: +<<<<<<< Updated upstream host: debian-bookworm images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-firmware-mega-image initramfs-rootfs-image cryptodev-module esp-qcom-image machines: qcom-armv8a qcom-armv7a-modem qcom-armv7a @@ -16,6 +17,17 @@ jobs: qcom-armv7a-modem-glibc-linaro-qcomlt qcom-armv7a-modem-musl-linaro-qcomlt qcom-armv8a-glibc-linaro-qcomlt qcom-armv8a-glibc-yocto-noinitramfs +======= + host: ubuntu-20.04 + images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image cryptodev-module + machines: dragonboard-410c dragonboard-845c qrb5165-rb5 qcom-armv8a sa8155p-adp + variants: >- + dragonboard-410c-glibc-linaro-qcomlt dragonboard-410c-musl-linaro-qcomlt + dragonboard-845c-glibc-linaro-qcomlt dragonboard-845c-musl-linaro-qcomlt + qrb5165-rb5-glibc-linaro-qcomlt qrb5165-rb5-musl-linaro-qcomlt + qcom-armv8a-glibc-linaro-qcomlt qcom-armv8a-musl-linaro-qcomlt + sa8155p-adp-glibc-linaro-qcomlt sa8155p-adp-musl-linaro-qcomlt +>>>>>>> Stashed changes ref: refs/pull/${{github.event.pull_request.number}}/merge branch: ${{github.base_ref}} url: ${{github.server_url}}/${{github.repository}} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 176042f01..eff318db5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,6 +13,7 @@ jobs: build: uses: ./.github/workflows/build-template.yml with: +<<<<<<< Updated upstream host: debian-bookworm images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image initramfs-firmware-image initramfs-firmware-mega-image initramfs-rootfs-image cryptodev-module esp-qcom-image machines: qcom-armv8a qcom-armv7a-modem qcom-armv7a @@ -22,6 +23,17 @@ jobs: qcom-armv7a-modem-glibc-linaro-qcomlt qcom-armv7a-modem-musl-linaro-qcomlt qcom-armv8a-glibc-linaro-qcomlt qcom-armv8a-glibc-yocto-noinitramfs +======= + host: ubuntu-20.04 + images: core-image-base core-image-weston core-image-x11 initramfs-test-image initramfs-test-full-image cryptodev-module + machines: dragonboard-410c dragonboard-845c qrb5165-rb5 qcom-armv8a sa8155p-adp + variants: >- + dragonboard-410c-glibc-linaro-qcomlt dragonboard-410c-musl-linaro-qcomlt + dragonboard-845c-glibc-linaro-qcomlt dragonboard-845c-musl-linaro-qcomlt + qrb5165-rb5-glibc-linaro-qcomlt qrb5165-rb5-musl-linaro-qcomlt + qcom-armv8a-glibc-linaro-qcomlt qcom-armv8a-musl-linaro-qcomlt + sa8155p-adp-glibc-linaro-qcomlt sa8155p-adp-musl-linaro-qcomlt +>>>>>>> Stashed changes ref: ${{github.sha}} ref_type: sha branch: ${{github.ref_name}}