From 2bdd3301b09ffa18649c73418aa5c3ebba824d82 Mon Sep 17 00:00:00 2001
From: awalsh128 <awalsh128@gmail.com>
Date: Sat, 7 Nov 2026 12:31:33 -0800
Subject: [PATCH] ci: pin version-list jobs to ubuntu-24.04 and fix
 spaces-in-paths tests

- list_versions / list_all_versions: run on ubuntu-24.04. The expected
  versions are from 24.04, but ubuntu-latest now resolves newer ones
  (e.g. rolldice=1.16-1build4, xdot=1.6-1).
- regression_76: cache libopenal-data ("Default HRTF.mhr") instead of
  Intel oneAPI. Drops the Intel repo and the unused opencl and
  libsundials-dev installs (188 MB, 155 packages), which made the job
  take 75+ minutes when the Ubuntu mirror was slow. Cap at 15 minutes.
- regression_81: list alsa-ucm-conf explicitly so the test caches a
  package with spaces in its file paths.

Same fixes as #235 and #236 on master.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72572c6..2f4c987 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,7 +164,7 @@ jobs:
 
   # All other jobs should depend on build_binaries (if run) or check_distribute (if not needed)
   list_all_versions:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04 # expected versions below are from Ubuntu 24.04
     needs: [testing]
     name: List all package versions (including deps).
     steps:
@@ -194,7 +194,7 @@ jobs:
         shell: bash
 
   list_versions:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04 # expected versions below are from Ubuntu 24.04
     needs: [testing]
     name: List package versions.
     steps:
@@ -515,22 +515,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: [testing]
     name: "Cache empty archive (regression issue #76)."
+    timeout-minutes: 15
     steps:
       - name: Download Action Bundle
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: action-bundle-${{ github.event.pull_request.head.sha || github.sha }}
           path: .
-      - run: |
-          sudo wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null;
-          echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list;
-          sudo apt-get -qq update;
-          sudo apt-get install -y intel-oneapi-runtime-libs intel-oneapi-runtime-opencl;
-          sudo apt-get install -y opencl-headers ocl-icd-opencl-dev;
-          sudo apt-get install -y libsundials-dev;
+      # The original report was an Intel oneAPI package whose files have spaces in their
+      # paths. libopenal-data ships "/usr/share/openal/hrtf/Default HRTF.mhr" and comes
+      # from the Ubuntu archive, so no third-party repo or extra installs are needed.
       - uses: ./
         with:
-          packages: intel-oneapi-runtime-libs
+          packages: libopenal-data
           version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_76
           debug: ${{ env.DEBUG }}
 
@@ -563,7 +560,7 @@ jobs:
       - uses: ./
         with:
           packages:
-            libasound2t64 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcups2 libdrm2 libgbm1
+            alsa-ucm-conf libasound2t64 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcups2 libdrm2 libgbm1
             libnspr4 libnss3 libxcomposite1 libxdamage1 libxfixes3 libxkbcommon0 libxrandr2
           version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_81
           debug: ${{ env.DEBUG }}