From 859d04b47eb14cd05e0e2ac70c93fd999ec9a2a5 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Mon, 1 Jul 2024 23:04:56 +0200 Subject: [PATCH] Fix cross-compile pipeline job building for ARM 7 (#33830) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description:** This PR fixes a small issue in the `cross-compile` pipeline job. https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/23436 aimed to introduce a new specific matrix configuration that built for linux/arm with ARMv7 but accidentally built all arm jobs with ARMv7 with some magic of YAML and GitHub actions matrix definitions 😇 **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29542 **Testing:** not sure how to test, since this is just pipeline changes **Documentation:** no docs added Signed-off-by: Moritz Wiesinger --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ae98815738e4..5d9771c1087c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -480,8 +480,8 @@ jobs: - s390x include: - os: linux - - arch: arm - - arm: 7 + arch: arm + arm: 7 exclude: - os: darwin arch: 386