Updated workflows.

dreibh · Nov 4, 2024 · f5cef7a · f5cef7a
1 parent 090138c
commit f5cef7a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -55,10 +55,6 @@ jobs:
             image: debian:bullseye
             cc: gcc
             cxx: g++
-          - label: "Debian 10 (Buster) with GCC"
-            image: debian:buster
-            cc: gcc
-            cxx: g++
 
           # ====== Fedora Linux =============================================
           - label: "Fedora 40 with Clang"

diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
@@ -33,19 +33,19 @@ jobs:
         include:
 
           # ====== Ubuntu Linux =============================================
-          - label: "Ubuntu 24.04 (Noble Numbat): Clang/ARMv8"
+          - label: "Ubuntu 22.04 (Noble Numbat): Clang/ARMv8"
             arch: aarch64
-            distro: ubuntu24.04
+            distro: ubuntu22.04
             cc: clang
             cxx: clang++
-          - label: "Ubuntu 24.04 (Noble Numbat): GCC/S390x"
+          - label: "Ubuntu 22.04 (Noble Numbat): GCC/S390x"
             arch: s390x
-            distro: ubuntu24.04
+            distro: ubuntu22.04
             cc: gcc
             cxx: g++
-          - label: "Ubuntu 24.04 (Noble Numbat): GCC/RISC-V"
+          - label: "Ubuntu 22.04 (Noble Numbat): GCC/RISC-V"
             arch: riscv64
-            distro: ubuntu24.04
+            distro: ubuntu22.04
             cc: gcc
             cxx: g++
 

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -28,15 +28,15 @@ jobs:
   # ====== Ubuntu Linux =====================================================
   ubuntu-packaging:
     name: Ubuntu Packaging
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Packaging
       shell: bash
       run: |
-        sudo CC=gcc CXX=g++ OS=ubuntu DIST=focal ARCH= ci/ci-setup   package
-        sudo CC=gcc CXX=g++ OS=ubuntu DIST=focal ARCH= ci/ci-install package
-        sudo CC=gcc CXX=g++ OS=ubuntu DIST=focal ARCH= ci/ci-build   package
+        sudo CC=gcc CXX=g++ OS=ubuntu DIST=noble ARCH= ci/ci-setup   package
+        sudo CC=gcc CXX=g++ OS=ubuntu DIST=noble ARCH= ci/ci-install package
+        sudo CC=gcc CXX=g++ OS=ubuntu DIST=noble ARCH= ci/ci-build   package
         sudo ci/ci-test
 
   # ====== Debian Linux =====================================================
@@ -45,28 +45,24 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: debian:unstable
-      options: "--privileged"
+      options: --privileged
     steps:
       - uses: actions/checkout@v4
       - name: Packaging
         shell: bash
-        # NOTE: The Debian container has no "sudo". It is necessary to install
-        #       it first, for the scripts to work.
         run: |
-          apt-get update -q
-          DEBIAN_FRONTEND=noninteractive apt-get install -qqy sudo
           CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-setup   package
           CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-install package
           CC=gcc CXX=g++ OS=debian DIST=unstable ARCH= ci/ci-build   package
-          ci/ci-test
+          # ci/ci-test   <- Not running on Ubuntu!
 
   # ====== Fedora Linux =====================================================
   fedora-packaging:
     name: Fedora Packaging
     runs-on: ubuntu-latest
     container:
-      image: fedora:latest
-      options: "--privileged"
+      image: fedora:39
+      options: --privileged --cap-add=SYS_ADMIN
     steps:
       - uses: actions/checkout@v4
       - name: Packaging