From: Jan Kiszka <[email protected]>

Allows to drop the meanwhile broken update of cppcheck.

Signed-off-by: Jan Kiszka <[email protected]>
---
 .github/workflows/main.yaml | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 19fe3a5..b123c85 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -22,7 +22,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target:
@@ -58,12 +58,12 @@ jobs:
           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/ focal main restricted
-          deb [arch=arm64] http://ports.ubuntu.com/ focal-updates main 
restricted
-          deb [arch=arm64] http://ports.ubuntu.com/ focal universe
-          deb [arch=arm64] http://ports.ubuntu.com/ focal-updates universe
-          deb [arch=arm64] http://ports.ubuntu.com/ focal multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ focal-updates multiverse
+          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
           EOF"
           sudo apt-get update
           sudo apt-get install --no-install-recommends \
@@ -76,12 +76,12 @@ jobs:
           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/ focal main restricted
-          deb [arch=armhf] http://ports.ubuntu.com/ focal-updates main 
restricted
-          deb [arch=armhf] http://ports.ubuntu.com/ focal universe
-          deb [arch=armhf] http://ports.ubuntu.com/ focal-updates universe
-          deb [arch=armhf] http://ports.ubuntu.com/ focal multiverse
-          deb [arch=armhf] http://ports.ubuntu.com/ focal-updates multiverse
+          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
           EOF"
           sudo apt-get update
           sudo apt-get install --no-install-recommends \
@@ -91,15 +91,8 @@ jobs:
       - name: Install cppcheck
         if: ${{ matrix.target == 'cppcheck' }}
         run: |
-          sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu hirsute main 
universe' \
-              > /etc/apt/sources.list.d/hirsute.list"
-          sudo sh -c "cat <<EOF > /etc/apt/preferences.d/hirsute.pref
-          Package: *
-          Pin: release n=hirsute
-          Pin-Priority: -1
-          EOF"
           sudo apt-get update
-          sudo apt-get install --no-install-recommends libz3-4/hirsute 
cppcheck/hirsute
+          sudo apt-get install --no-install-recommends cppcheck
 
       - name: Prepare build
         run: |
-- 
2.35.3

-- 
You received this message because you are subscribed to the Google Groups "EFI 
Boot Guard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/efibootguard-dev/b1eaa1b9e3eb2e3b5bed15d96e6418c425d1c2ca.1658901190.git.jan.kiszka%40siemens.com.

Reply via email to