From 18242499fb78c8ec1cd99530016a235aa4931fc2 Mon Sep 17 00:00:00 2001
From: Paul Adelsbach <paul.adelsbach@wolfssl.com>
Date: Mon, 26 Oct 2026 17:27:39 -0700
Subject: [PATCH] CI: NXP: install PowerPC toolchain from bundle to avoid
 timeouts

---
 .github/ci-deps/packages-ubuntu-24.04-cross.txt |  9 +++++----
 .github/workflows/ci-deps-image.yml             |  2 +-
 .github/workflows/sec-qoriq.yml                 | 13 +++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/ci-deps/packages-ubuntu-24.04-cross.txt b/.github/ci-deps/packages-ubuntu-24.04-cross.txt
index 840a3662088..687233d4f00 100644
--- a/.github/ci-deps/packages-ubuntu-24.04-cross.txt
+++ b/.github/ci-deps/packages-ubuntu-24.04-cross.txt
@@ -1,7 +1,7 @@
-# pq-all's cross-compilation apt packages for ubuntu-24.04 (the '-cross'
-# bundle: ghcr.io/<owner>/wolfssl-ci-debs:ubuntu-24.04-cross). Separate from
-# -minimal because the ARM toolchains are ~118 MB and the 19 workflows on
-# -minimal do not cross-compile. Keep sorted.
+# Cross-compilation apt packages for ubuntu-24.04 (the '-cross' bundle:
+# ghcr.io/<owner>/wolfssl-ci-debs:ubuntu-24.04-cross), used by pq-all (ARM)
+# and sec-qoriq (PowerPC). Separate from -minimal because the toolchains are
+# ~160 MB and the 19 workflows on -minimal do not cross-compile. Keep sorted.
 autoconf
 automake
 bubblewrap
@@ -9,4 +9,5 @@ build-essential
 ccache
 crossbuild-essential-arm64
 crossbuild-essential-armhf
+gcc-powerpc-linux-gnu
 libtool
diff --git a/.github/workflows/ci-deps-image.yml b/.github/workflows/ci-deps-image.yml
index 116f7dae8cc..735306efd40 100644
--- a/.github/workflows/ci-deps-image.yml
+++ b/.github/workflows/ci-deps-image.yml
@@ -81,7 +81,7 @@ jobs:
           # tag so it does not bloat the -full pull for the interop workflows.
           - runner: ubuntu-24.04
             tag: ubuntu-24.04-embedded
-          # pq-all's ARM cross-toolchains (~118 MB). Its own tag for the same
+          # ARM and PowerPC cross-toolchains (~160 MB). Its own tag for the same
           # reason: -minimal is pulled by 19 workflows that do not cross-compile.
           - runner: ubuntu-24.04
             tag: ubuntu-24.04-cross
diff --git a/.github/workflows/sec-qoriq.yml b/.github/workflows/sec-qoriq.yml
index 9948c412825..4c52e82f529 100644
--- a/.github/workflows/sec-qoriq.yml
+++ b/.github/workflows/sec-qoriq.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # cmake first: it builds from the pristine checkout and relies on the
       # in-tree wolfssl/version.h, which an autotools "make distclean" would
@@ -52,18 +52,19 @@ jobs:
     name: PowerPC cross-compile, ${{ matrix.backend }} backend
     if: ${{ (github.repository_owner == 'wolfssl') && (github.event_name != 'pull_request' || github.event.pull_request.draft == false) }}
     runs-on: ubuntu-24.04
-    timeout-minutes: 15
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         backend: [ baremetal, linux ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: install PowerPC toolchain
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-powerpc-linux-gnu
+        uses: ./.github/actions/install-apt-deps
+        with:
+          packages: gcc-powerpc-linux-gnu
+          ghcr-debs-tag: ubuntu-24.04-cross
 
       - name: cross-compile the library
         run: |