Cross-compilation on GitHub Actions Round 5

Dadoum · Jul 30, 2023 · 2027ac8 · 2027ac8
1 parent 7d28f6d
commit 2027ac8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/.github/workflows/cmake-cross-compile.yml b/.github/workflows/cmake-cross-compile.yml
@@ -14,12 +14,9 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        cat << EOF | tee /etc/apt/sources.list.d/gdc-backports.list
-        deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
-        deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
-        EOF
-        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
         apt-get update
+        apt-get install -y software-properties-common
+        add-apt-repository ppa:ubuntu-toolchain-r/ppa
         apt-get install -y git gdc-13-aarch64-linux-gnu dub libz-dev
 
     - uses: actions/checkout@v3
@@ -49,12 +46,9 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        cat << EOF | tee /etc/apt/sources.list.d/gdc-backports.list
-        deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
-        deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
-        EOF
-        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
-        apt-get update 
+        apt-get update
+        apt-get install -y software-properties-common
+        add-apt-repository ppa:ubuntu-toolchain-r/ppa
         apt-get install -y git gdc-13-arm-linux-gnueabihf dub libz-dev
 
     - uses: actions/checkout@v3

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -42,12 +42,9 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          cat << EOF | tee /etc/apt/sources.list.d/gdc-backports.list
-          deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
-          deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
-          EOF
-          apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60C317803A41BA51845E371A1E9377A2BA9EF27F
           apt-get update
+          apt-get install -y software-properties-common
+          add-apt-repository ppa:ubuntu-toolchain-r/ppa
           apt-get install -y git gdc-13-i686-linux-gnu dub libz-dev
 
       - uses: actions/checkout@v3