From e9e071ae7244922a77fd0d5222d0897e6dc07981 Mon Sep 17 00:00:00 2001
From: AlekseyMartynov <AlekseyMartynov@users.noreply.github.com>
Date: Sat, 5 Oct 2024 16:34:58 +0300
Subject: [PATCH] Rewrite install-ubuntu-arm64.sh for deb822

---
 .github/workflows/ci.yml                      |  2 +-
 .github/workflows/install-ubuntu-arm64.sh     |  8 ++----
 .../workflows/install-ubuntu-arm64.sources    | 27 +++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/install-ubuntu-arm64.sources

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 79d2ab2..a418be7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         - { os: windows-latest, rid: win-x64 }
         - { os: windows-latest, rid: win-arm64 }
         - { os: ubuntu-latest, rid: linux-x64 }
-        - { os: ubuntu-22.04, rid: linux-arm64 }
+        - { os: ubuntu-latest, rid: linux-arm64 }
         - { os: macos-latest, rid: osx-x64 }
         - { os: macos-latest, rid: osx-arm64 }
 
diff --git a/.github/workflows/install-ubuntu-arm64.sh b/.github/workflows/install-ubuntu-arm64.sh
index b4fc6cc..9d6c6c9 100644
--- a/.github/workflows/install-ubuntu-arm64.sh
+++ b/.github/workflows/install-ubuntu-arm64.sh
@@ -4,12 +4,8 @@ if [ $(uname -m) != "x86_64" ] || [ -z "$CODENAME" ]; then
     return 1
 fi
 
-sed -i 's|^deb |deb [arch=amd64] |g' /etc/apt/sources.list
-
-cat >> /etc/apt/sources.list <<EOF
-deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ $CODENAME main restricted
-deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ $CODENAME-updates main restricted
-EOF
+cp -f .github/workflows/install-ubuntu-arm64.sources /etc/apt/sources.list.d/ubuntu.sources
+sed -i "s|CODENAME|$CODENAME|g" /etc/apt/sources.list.d/ubuntu.sources
 
 dpkg --add-architecture arm64
 
diff --git a/.github/workflows/install-ubuntu-arm64.sources b/.github/workflows/install-ubuntu-arm64.sources
new file mode 100644
index 0000000..ad09523
--- /dev/null
+++ b/.github/workflows/install-ubuntu-arm64.sources
@@ -0,0 +1,27 @@
+Types: deb
+URIs: http://azure.archive.ubuntu.com/ubuntu/
+Suites: CODENAME CODENAME-updates CODENAME-backports
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: amd64
+
+Types: deb
+URIs: http://azure.archive.ubuntu.com/ubuntu/
+Suites: CODENAME-security
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: amd64
+
+Types: deb
+URIs: http://azure.ports.ubuntu.com/ubuntu-ports/
+Suites: CODENAME CODENAME-updates CODENAME-backports
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: arm64
+
+Types: deb
+URIs: http://azure.ports.ubuntu.com/ubuntu-ports/
+Suites: CODENAME-security
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: arm64