partial revert upstream mistakes b69eff0

using ports.ubuntu.com and archive/security.ubuntu.com via specifying the arch variable in sources lists is the proper method. this will produce no apt update errors and will actually obtain all package info
libgdx · Apr 14, 2024 · dd14455 · dd14455
1 parent fa28466
commit dd14455
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/pushaction.yml b/.github/workflows/pushaction.yml
@@ -94,10 +94,13 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2.4.2
 
-    - run: echo "http://ports.ubuntu.com/ubuntu-ports" | sudo tee -a /etc/apt/apt-mirrors.txt
+    - run: sudo sed -i 's/deb http/deb [arch=amd64,i386] http/' /etc/apt/sources.list
+    - run: sudo grep "ubuntu.com/ubuntu" /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/ports.list
+    - run: sudo sed -i 's/amd64,i386/armhf,arm64/' /etc/apt/sources.list.d/ports.list
+    - run: sudo sed -i 's#http://.*/ubuntu#http://ports.ubuntu.com/ubuntu-ports#' /etc/apt/sources.list.d/ports.list
     - name: Add extra platform architectures
       run: sudo dpkg --add-architecture i386; sudo dpkg --add-architecture armhf; sudo dpkg --add-architecture arm64
-    - run: sudo apt-get update || true
+    - run: sudo apt-get update
     - name: Install Windows compilers
       run: sudo apt-get -yq install g++-mingw-w64-i686 g++-mingw-w64-x86-64
     - name: Install Linux x86 compilers/libraries

diff --git a/.github/workflows/releaseaction.yml b/.github/workflows/releaseaction.yml
@@ -97,10 +97,13 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2.4.2
 
-    - run: echo "http://ports.ubuntu.com/ubuntu-ports" | sudo tee -a /etc/apt/apt-mirrors.txt
+    - run: sudo sed -i 's/deb http/deb [arch=amd64,i386] http/' /etc/apt/sources.list
+    - run: sudo grep "ubuntu.com/ubuntu" /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/ports.list
+    - run: sudo sed -i 's/amd64,i386/armhf,arm64/' /etc/apt/sources.list.d/ports.list
+    - run: sudo sed -i 's#http://.*/ubuntu#http://ports.ubuntu.com/ubuntu-ports#' /etc/apt/sources.list.d/ports.list
     - name: Add extra platform architectures
       run: sudo dpkg --add-architecture i386; sudo dpkg --add-architecture armhf; sudo dpkg --add-architecture arm64
-    - run: sudo apt-get update || true
+    - run: sudo apt-get update
     - name: Install Windows compilers
       run: sudo apt-get -yq install g++-mingw-w64-i686 g++-mingw-w64-x86-64
     - name: Install Linux x86 compilers/libraries