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 062884301E for ; Thu, 10 Aug 2023 01:50:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3C2E40DFB; Thu, 10 Aug 2023 01:50:27 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2078.outbound.protection.outlook.com [40.107.93.78]) by mails.dpdk.org (Postfix) with ESMTP id 41DE040DD8 for ; Thu, 10 Aug 2023 01:50:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GEpFg7wYzeXghUTy7FiGDwz/fBT1r+2b704eiBuwtY584HLGW/49fXaBfvdW5RAoV5ktH54rqGmcHis+h+aRqHbmc1qrCT1uDhK3UEiUfSsg9Ih+MxHlps4ZaJbnR5RaFb0kD9bb2cE7RH9GvDEIQ8QHvehk2LTW0EWrNkcXLxgK3seMChxSNwZUz7zcAJAaVCOe+mPKr2RaebLr6IX5/6uGhGqNIhESKeQrrj50KlH6me1oLCYGTFIjxbkIUVlas0KdIVrO+DL3fVdOMQR/7gBgtYv2UQqvuGCbfSiNh4LBZFa7n8J2DSF3oVmcFJz0YuKwolqnUgFXotElh/7aZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jdBnLBjM3JwBYxLJH5LCBfBm0vSEnryAHJibluA3haU=; b=ZRM8LUthhdfp3AEsZknCx9pJ092K1J7wkBor9C2yeYkRqFR0AhJlHR3bPCE+mmRUzoLEW00eSKfMT9bxqs+M5qA8i4GcookCvOPWUjdpPTaV24iAEt1yQ0S81UVTLXYKLuK+Tx8wHBtQE90x6N/TXYG+iCmMt+tW2Bk9qb07OwlC/CaIPGjNjngzDI+U/wz1Z/wOHuU6QDA3lZncMoWQ/jHFoXonZayVlXNs1eluJdmsMiHVMt7i/KD5kCgrGsVsCsmfMyo5Ix1dznqCvL8yF6+vnuQFfQvaHnrbPKEu4kU3VrqAwdvgwU2ETbV33y6/XS0hvjBmYALDIQheiFruhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jdBnLBjM3JwBYxLJH5LCBfBm0vSEnryAHJibluA3haU=; b=W/0iYAblwMqmwXsZ9RhsWZeTIlwTukbLvNnZ4vaJXGt6qrvJBgtbAlwqqFKVWy2bqwGsuIOxL8fX4mVgzNNP4oFCTWZEkdVKD8U8fc71WDwVSS/bYtcF2wP7c50XxZG7szvyV4e4U6mCrL08UCfhNzFc2SgL4WE943mZgCQ7hGXjSe/ytv48zIe0zDhhbOIUith5WXA7AY71KyIaPsKHJpCW5UhstvowVY/0VzVw46Cka5P44m9uwte/N7dBiiyqM+XJkyBXmB+fhUOfcm/Mklwg1B2SWe7U4fj6a5wCDnLODqfF94QYHT++RTGQtt3vbj7VjVjRHaSIf5MGpY8HbA== Received: from MW4PR04CA0228.namprd04.prod.outlook.com (2603:10b6:303:87::23) by SJ2PR12MB9189.namprd12.prod.outlook.com (2603:10b6:a03:55b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:50:25 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:303:87:cafe::d1) by MW4PR04CA0228.outlook.office365.com (2603:10b6:303:87::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:50:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.0 via Frontend Transport; Wed, 9 Aug 2023 23:50:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:50:13 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 16:50:11 -0700 From: Xueming Li To: David Marchand CC: Aaron Conole , dpdk stable Subject: patch 'ci: fix libabigail cache in GHA' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:27 +0800 Message-ID: <20230809234930.32424-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F7:EE_|SJ2PR12MB9189:EE_ X-MS-Office365-Filtering-Correlation-Id: 40cff247-a3bf-4e4d-da10-08db9933670e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ytnoar8iq+/rIWH7mJOztMieULcyNzpWwWXy1VpkXxL0BQoGbO53zp77sZf6X6BI6EBANX9GoEPOWAObY83OoI6Kd7VTqn57PdK2w1GHQ5TPhtVFfhsRCvyjj2Ch7WC07VyQWtL7JAJTetXAij9bqk2I8RRL4qlR6uSIjL0hGY+xXMcmTrNTP3ZoYNvKLoN9dql2YAhGwVygUSu8gSnX3wYJ2JKXaSH6Z4CgrjG/JCfBOgLCQ3IdGvQfoa5ykhADXypOFUHwGcon1dzyna3a+FJcZqnT7GYl0+p0Di0d7KgI+AqAAkT5RJt1sV2VeavvkFlsljKaJC43o03gRFTg0d3+WRiEmUPimbS9oynPgbLdopU/tBdphKe6v7eH8R7hkOc3PAUHnRFFyUHVcu7CdxU8rTtWuQUh6vzLwY4MRvAIssBCUHWwmrtP0BZOficZzJe6SqtTin+hg9P8fqT98D/0Ddyx/PBufx55NGG9arsVPJ60mfxjcqPQw3xSAf0xWGOEjbKmhx615RuVc6+B3pfX1BX+ffJoEUC9+m4IC48tcZK50H1z0HB+aQoChuY6Dk6MyNs+k09Jwgt4zjfTRIXoW7bpP8uSDojmnFr4wcg+miDHHk5KVDbCBBRPqnKSiBH3JgxFMWI8tImQYpjmrliraTVH5S+Ee50RdjNv5mWUvn1Gd7n4rDfsubD8O3jok7kNjAVGvmCtdD/VhEl9h/5ojSDeJARaXzHywN+uvMsLnT6EBcWnk0Yt8646EQ8Cb7DSXAoqOCDAFF97e3ZLfg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(39860400002)(346002)(396003)(376002)(451199021)(1800799006)(82310400008)(186006)(40470700004)(46966006)(36840700001)(7696005)(2616005)(55016003)(356005)(426003)(7636003)(82740400003)(6666004)(40460700003)(36756003)(53546011)(1076003)(336012)(26005)(16526019)(6286002)(966005)(40480700001)(5660300002)(316002)(47076005)(54906003)(4326008)(6916009)(70206006)(70586007)(36860700001)(2906002)(83380400001)(8936002)(41300700001)(478600001)(8676002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:50:25.2903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40cff247-a3bf-4e4d-da10-08db9933670e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9189 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=0d5c3e03c58849ee879f6595e05d28cd8253a5f9 Thanks. Xueming Li --- >From 0d5c3e03c58849ee879f6595e05d28cd8253a5f9 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 Cc: Xueming Li [ 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 735c58ef2b..9512219a05 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.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}' >> $GITHUB_OUTPUT - name: Retrieve ccache cache uses: actions/cache@v3 -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.440273300 +0800 +++ 0005-ci-fix-libabigail-cache-in-GHA.patch 2023-08-09 21:51:18.114352000 +0800 @@ -1 +1 @@ -From 870623ad9ed33f21102a5ddc18e15d726e65204d Mon Sep 17 00:00:00 2001 +From 0d5c3e03c58849ee879f6595e05d28cd8253a5f9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 870623ad9ed33f21102a5ddc18e15d726e65204d ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 414dd089e0..0e2adb5106 100644 +index 735c58ef2b..9512219a05 100644 @@ -32 +34 @@ -@@ -70,7 +70,7 @@ jobs: +@@ -69,7 +69,7 @@ jobs: @@ -38 +40 @@ - 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