From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6ACDF42ECF for ; Thu, 20 Jul 2023 17:25:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64BF240685; Thu, 20 Jul 2023 17:25:06 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 60D6A400D6 for ; Thu, 20 Jul 2023 17:25:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3nsCgfo107eSiWmE10wx+/GC5i5civcISB9rAYC0VJE=; b=QZZpai7Jshu3pVYp327LC1k1NjyqcNxPWmOsiCFQXwrECPU3xyET/4pGVjCMsBdbWVHPvA 2RtunulDNT5maUrsDcF9Yj6Z6niXTpbFWTHfRpNpc3bfym6oM67HZIupQC7Fv5Jv5ViWRP 9MiY1ShSYSHxrglJ2tOd26L43v7qWN0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-Tuk_LsKNPSKuJ_JYfwNWaA-1; Thu, 20 Jul 2023 11:22:31 -0400 X-MC-Unique: Tuk_LsKNPSKuJ_JYfwNWaA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4BF583DD1F for ; Thu, 20 Jul 2023 15:22:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E96F54CD0E3; Thu, 20 Jul 2023 15:22:04 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Aaron Conole , dpdk stable Subject: patch 'ci: fix libabigail cache in GHA' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:34 +0100 Message-ID: <20230720151942.262154-83-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ad9d44049a7fe897730439ac6f68edbe3099ecd6 Thanks. Kevin --- >From ad9d44049a7fe897730439ac6f68edbe3099ecd6 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 20 Jun 2023 15:29:55 +0200 Subject: [PATCH] ci: fix libabigail cache in GHA [ upstream commit 870623ad9ed33f21102a5ddc18e15d726e65204d ] In repositories where multiple branches run the ABI checks using different versions of libabigail (for example, a 22.11 branch using libabigail-1.8 and a main branch using libabigail-2.1), a collision happens on the libabigail binary cache entry. As a single cache entry is used, the content of the cache (let's say the cache was built for libabigail 2.1) won't match what the branch wants to use (in this example running the check for 22.11 branch requires libabigail 1.8). .ci/linux-build.sh then tries to recompile libabigail but it fails as the packages used for building libabigail are missing. Add the version to the cache entry name to avoid this collision. Fixes: 443267090edc ("ci: enable v21 ABI checks") Signed-off-by: David Marchand Acked-by: Aaron Conole --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0df7a6a29c..f1079d840e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,5 +77,5 @@ jobs: run: | echo 'ccache=ccache-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT - echo 'libabigail=libabigail-${{ matrix.config.os }}' >> $GITHUB_OUTPUT + echo 'libabigail=libabigail-${{ env.LIBABIGAIL_VERSION }}-${{ matrix.config.os }}' >> $GITHUB_OUTPUT echo 'abi=abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}' >> $GITHUB_OUTPUT - name: Retrieve ccache cache -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:04.962919126 +0100 +++ 0083-ci-fix-libabigail-cache-in-GHA.patch 2023-07-20 16:17:54.929751602 +0100 @@ -1 +1 @@ -From 870623ad9ed33f21102a5ddc18e15d726e65204d Mon Sep 17 00:00:00 2001 +From ad9d44049a7fe897730439ac6f68edbe3099ecd6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 870623ad9ed33f21102a5ddc18e15d726e65204d ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 414dd089e0..0e2adb5106 100644 +index 0df7a6a29c..f1079d840e 100644 @@ -32 +33 @@ -@@ -71,5 +71,5 @@ jobs: +@@ -77,5 +77,5 @@ jobs: @@ -37 +38 @@ - echo 'abi=abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.REF_GIT_TAG }}' >> $GITHUB_OUTPUT + echo 'abi=abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}' >> $GITHUB_OUTPUT