Fix issue with arm github action

DominiquePaul · Sep 18, 2024 · 03adbae · 03adbae
1 parent 3239975
commit 03adbae
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,24 +37,21 @@ jobs:
     - name: Setup ARM build environment
       run: |
         sudo dpkg --add-architecture arm64
-        . /etc/os-release
-        echo "using Ubuntu with codename $VERSION_CODENAME"
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME main restricted" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-updates main restricted" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME universe" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-updates universe" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME multiverse" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-updates multiverse" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-security main restricted" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-security universe" | sudo tee -a /etc/apt/sources.list
-        echo "deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports $VERSION_CODENAME-security multiverse" | sudo tee -a /etc/apt/sources.list
+        sudo tee /etc/apt/sources.list > /dev/null <<EOT
+        deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
+        deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
+        deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse
+        deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
+        deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
+        EOT
         sudo apt update
         sudo apt upgrade -y
-        sudo apt install gcc-aarch64-linux-gnu -y
+        sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu -y
         rustup target add aarch64-unknown-linux-gnu
-        sudo apt install libwebkit2gtk-4.0-dev:arm64 -y
-        sudo apt install libssl-dev:arm64 -y
+        sudo apt install libwebkit2gtk-4.0-dev:arm64 libssl-dev:arm64 -y
         export PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu/
     - name: Install pnpm
       uses: pnpm/action-setup@v4