ci: remove android builds for x86 and x86_64

They are failing to build.
deltachat · Apr 3, 2024 · 87e9365 · 87e9365
1 parent 9806509
commit 87e9365
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/.github/workflows/deltachat-rpc-server.yml b/.github/workflows/deltachat-rpc-server.yml
@@ -99,7 +99,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [arm64-v8a, armeabi-v7a, x86, x86_64]
+        arch: [arm64-v8a, armeabi-v7a]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -201,18 +201,6 @@ jobs:
           name: deltachat-rpc-server-armeabi-v7a-android
           path: deltachat-rpc-server-armeabi-v7a-android.d
 
-      - name: Download Android binary for x86
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86-android
-          path: deltachat-rpc-server-x86-android.d
-
-      - name: Download Android binary for x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: deltachat-rpc-server-x86_64-android
-          path: deltachat-rpc-server-x86_64-android.d
-
       - name: Create bin/ directory
         run: |
           mkdir -p bin
@@ -227,8 +215,6 @@ jobs:
           mv deltachat-rpc-server-aarch64-macos.d/deltachat-rpc-server bin/deltachat-rpc-server-aarch64-macos
           mv deltachat-rpc-server-arm64-v8a-android.d/deltachat-rpc-server bin/deltachat-rpc-server-arm64-v8a-android
           mv deltachat-rpc-server-armeabi-v7a-android.d/deltachat-rpc-server bin/deltachat-rpc-server-armeabi-v7a-android
-          mv deltachat-rpc-server-x86-android.d/deltachat-rpc-server bin/deltachat-rpc-server-x86-android
-          mv deltachat-rpc-server-x86_64-android.d/deltachat-rpc-server bin/deltachat-rpc-server-x86_64-android
 
       - name: List binaries
         run: ls -l bin/

diff --git a/flake.nix b/flake.nix
@@ -263,14 +263,6 @@
             cc = "aarch64-linux-android21-clang";
             rustTarget = "aarch64-linux-android";
           };
-          x86 = {
-            cc = "i686-linux-android19-clang";
-            rustTarget = "i686-linux-android";
-          };
-          x86_64 = {
-            cc = "x86_64-linux-android21-clang";
-            rustTarget = "x86_64-linux-android";
-          };
         };
 
         mkAndroidRustPackage = arch: packageName: