patch 'ci: fix ccache for Ubuntu 22.04' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Fri Mar 7 13:47:16 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/12/25. 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/1deef2b44df879279ce965ee2565aef409a6d153
Thanks.
Kevin
---
>From 1deef2b44df879279ce965ee2565aef409a6d153 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 18 Feb 2025 10:51:19 +0100
Subject: [PATCH] ci: fix ccache for Ubuntu 22.04
[ upstream commit ef2535d022b9ee53467f7ae80018ab62edd8b0b1 ]
By default (and if no $HOME/.ccache directory exists), Ubuntu 22.04 ccache
stores its data in $HOME/.cache/ccache.
As a result, since the switch to Ubuntu 22.04, ccache has not been
functional.
Set the ccache directory to the location cached in GHA.
Note: ccache is working with the Fedora containers, as the presence of a
.ccache directory made ccache use it, still,
explicitly set CCACHE_DIR for consistency.
Fixes: 8400093195dd ("ci: bump tested distributions in GHA")
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
.github/workflows/build.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04c0404d3a..f39634d967 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,4 +46,5 @@ jobs:
BUILD_EXAMPLES: ${{ contains(matrix.config.checks, 'examples') }}
CC: ccache ${{ matrix.config.compiler }}
+ CCACHE_DIR: $HOME/.ccache
DEF_LIB: ${{ matrix.config.library }}
LIBABIGAIL_VERSION: libabigail-2.4
@@ -308,4 +309,5 @@ jobs:
> ~/env
echo CC=ccache ${{ matrix.config.compiler }} >> ~/env
+ echo CCACHE_DIR=/root/.ccache >> ~/env
echo DEF_LIB=${{ matrix.config.library }} >> ~/env
echo STDATOMIC=false >> ~/env
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-03-07 11:02:58.465575516 +0000
+++ 0043-ci-fix-ccache-for-Ubuntu-22.04.patch 2025-03-07 11:02:56.923241255 +0000
@@ -1 +1 @@
-From ef2535d022b9ee53467f7ae80018ab62edd8b0b1 Mon Sep 17 00:00:00 2001
+From 1deef2b44df879279ce965ee2565aef409a6d153 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ef2535d022b9ee53467f7ae80018ab62edd8b0b1 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index e98a60a852..fba46b920f 100644
+index 04c0404d3a..f39634d967 100644
@@ -34 +35 @@
- LIBABIGAIL_VERSION: libabigail-2.6
+ LIBABIGAIL_VERSION: libabigail-2.4
More information about the stable
mailing list