From patchwork Tue Jun 20 13:29:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 128852 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C838842D08; Tue, 20 Jun 2023 15:30:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B22A640DDA; Tue, 20 Jun 2023 15:30:10 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 63B914068E for ; Tue, 20 Jun 2023 15:30:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687267808; 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; bh=YJwaXAWfuhc3JnfNtJqilJ3sG8wfLu3SBcJYkmZoae0=; b=a40Jrfjvl6wc8S+xwaQf8XOX0dSgaBygYK4bpFz3suWK+B5OaZSfDcgU4oTI/1uzrw61z6 kiRl1Y3dRjcapi4nTV12FYRKC0SuwqDH0CaiWGlJ/L3bm8GlaF1GIDPSvtuA1MrB5RqbG8 U/rnpTLgU4rBB4oQNwDUzLecB+y8KSo= 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-34-X3b17AmTNKWZ_qYXPNpyBQ-1; Tue, 20 Jun 2023 09:30:06 -0400 X-MC-Unique: X3b17AmTNKWZ_qYXPNpyBQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71B0F103963B; Tue, 20 Jun 2023 13:30:01 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F382200A398; Tue, 20 Jun 2023 13:30:00 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stable@dpdk.org, Aaron Conole , Michael Santana , Thomas Monjalon Subject: [PATCH] ci: fix libabigail cache in GHA Date: Tue, 20 Jun 2023 15:29:55 +0200 Message-Id: <20230620132955.46852-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: stable@dpdk.org 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 3b629fcdbd..7b69771a58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: id: get_ref_keys 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.REF_GIT_TAG }}' >> $GITHUB_OUTPUT - name: Retrieve ccache cache uses: actions/cache@v3