ci: Update to Ubuntu 24.04

jan-kiszka · jan-kiszka · commit 6d5875d2157f · 2025-05-13T16:30:39.000+02:00
Specifically 20.04 is now no longer available on GitHub.

Signed-off-by: Jan Kiszka &lt;jan.kiszka@siemens.com&gt;
diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
@@ -1,7 +1,7 @@
 #
 # EFI Boot Guard
 #
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
 #
 # Authors:
 #  Claudius Heine <ch@denx.de>
@@ -22,7 +22,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,7 +1,7 @@
 #
 # EFI Boot Guard
 #
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
 #
 # Authors:
 #  Claudius Heine <ch@denx.de>
@@ -22,7 +22,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         target:
@@ -57,14 +57,27 @@ jobs:
         if: ${{ matrix.target == 'arm64' }}
         run: |
           sudo dpkg --add-architecture arm64
-          sudo sed -i 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list
-          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ports.list
-          deb [arch=arm64] http://ports.ubuntu.com/ jammy main restricted
-          deb [arch=arm64] http://ports.ubuntu.com/ jammy-updates main restricted
-          deb [arch=arm64] http://ports.ubuntu.com/ jammy universe
-          deb [arch=arm64] http://ports.ubuntu.com/ jammy-updates universe
-          deb [arch=arm64] http://ports.ubuntu.com/ jammy multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ jammy-updates multiverse
+          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ubuntu.sources
+          Types: deb
+          URIs: http://archive.ubuntu.com/ubuntu/
+          Suites: noble noble-updates noble-backports
+          Components: main universe restricted multiverse
+          Architecture: amd64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          Types: deb
+          URIs: http://security.ubuntu.com/ubuntu/
+          Suites: noble-security
+          Components: main universe restricted multiverse
+          Architecture: amd64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          EOF"
+          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ports.sources
+          Types: deb
+          URIs: http://ports.ubuntu.com/ubuntu-ports/
+          Suites: noble noble-updates noble-security
+          Components: main restricted universe multiverse
+          Architectures: arm64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
           EOF"
           sudo apt-get update
           sudo apt-get install --no-install-recommends \
@@ -75,14 +88,27 @@ jobs:
         if: ${{ matrix.target == 'arm' }}
         run: |
           sudo dpkg --add-architecture armhf
-          sudo sed -i 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list
-          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ports.list
-          deb [arch=armhf] http://ports.ubuntu.com/ jammy main restricted
-          deb [arch=armhf] http://ports.ubuntu.com/ jammy-updates main restricted
-          deb [arch=armhf] http://ports.ubuntu.com/ jammy universe
-          deb [arch=armhf] http://ports.ubuntu.com/ jammy-updates universe
-          deb [arch=armhf] http://ports.ubuntu.com/ jammy multiverse
-          deb [arch=armhf] http://ports.ubuntu.com/ jammy-updates multiverse
+          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ubuntu.sources
+          Types: deb
+          URIs: http://archive.ubuntu.com/ubuntu/
+          Suites: noble noble-updates noble-backports
+          Components: main universe restricted multiverse
+          Architecture: amd64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          Types: deb
+          URIs: http://security.ubuntu.com/ubuntu/
+          Suites: noble-security
+          Components: main universe restricted multiverse
+          Architecture: amd64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          EOF"
+          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ports.sources
+          Types: deb
+          URIs: http://ports.ubuntu.com/ubuntu-ports/
+          Suites: noble noble-updates noble-security
+          Components: main restricted universe multiverse
+          Architectures: armhf
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
           EOF"
           sudo apt-get update
           sudo apt-get install --no-install-recommends \
@@ -93,14 +119,27 @@ jobs:
         if: ${{ matrix.target == 'riscv64' }}
         run: |
           sudo dpkg --add-architecture riscv64
-          sudo sed -i 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list
-          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ports.list
-          deb [arch=riscv64] http://ports.ubuntu.com/ jammy main restricted
-          deb [arch=riscv64] http://ports.ubuntu.com/ jammy-updates main restricted
-          deb [arch=riscv64] http://ports.ubuntu.com/ jammy universe
-          deb [arch=riscv64] http://ports.ubuntu.com/ jammy-updates universe
-          deb [arch=riscv64] http://ports.ubuntu.com/ jammy multiverse
-          deb [arch=riscv64] http://ports.ubuntu.com/ jammy-updates multiverse
+          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ubuntu.sources
+          Types: deb
+          URIs: http://archive.ubuntu.com/ubuntu/
+          Suites: noble noble-updates noble-backports
+          Components: main universe restricted multiverse
+          Architecture: amd64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          Types: deb
+          URIs: http://security.ubuntu.com/ubuntu/
+          Suites: noble-security
+          Components: main universe restricted multiverse
+          Architecture: amd64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+          EOF"
+          sudo sh -c "cat <<EOF > /etc/apt/sources.list.d/ports.sources
+          Types: deb
+          URIs: http://ports.ubuntu.com/ubuntu-ports/
+          Suites: noble noble-updates noble-security
+          Components: main restricted universe multiverse
+          Architectures: riscv64
+          Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
           EOF"
           sudo apt-get update
           sudo apt-get install --no-install-recommends \

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#`
`2`	`2`	`# EFI Boot Guard`
`3`	`3`	`#`
`4`		`-# Copyright (c) Siemens AG, 2021-2023`
	`4`	`+# Copyright (c) Siemens AG, 2021-2025`
`5`	`5`	`#`
`6`	`6`	`# Authors:`
`7`	`7`	`# Claudius Heine <ch@denx.de>`
`@@ -22,7 +22,7 @@ on:`
`22`	`22`
`23`	`23`	`jobs:`
`24`	`24`	`build:`
`25`		`- runs-on: ubuntu-20.04`
	`25`	`+ runs-on: ubuntu-24.04`
`26`	`26`	`steps:`
`27`	`27`	`- name: Checkout`
`28`	`28`	`uses: actions/checkout@v4`