From d515f3d3be9c6a50faadfbe6d3b6b12064d070f1 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 1 Aug 2024 16:46:26 +0600 Subject: [PATCH] cd: fix rustup target failing for ios --- .github/Dockerfile | 2 +- .github/Dockerfile.flutter_distributor | 23 ----------------------- cli/commands/install-dependencies.dart | 5 +++++ 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 .github/Dockerfile.flutter_distributor diff --git a/.github/Dockerfile b/.github/Dockerfile index 2e393449..4d0645d1 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -1,6 +1,6 @@ ARG FLUTTER_VERSION -FROM --platform=linux/arm64 krtirtho/flutter_distributor_arm64:${FLUTTER_VERSION} +FROM --platform=linux/arm64 krtirtho/flutter_distributor:${FLUTTER_VERSION} ARG BUILD_VERSION diff --git a/.github/Dockerfile.flutter_distributor b/.github/Dockerfile.flutter_distributor deleted file mode 100644 index d842e533..00000000 --- a/.github/Dockerfile.flutter_distributor +++ /dev/null @@ -1,23 +0,0 @@ -FROM --platform=linux/arm64 ubuntu:22.04 - -ARG FLUTTER_VERSION - -RUN apt-get clean &&\ - apt-get update &&\ - apt-get install -y bash curl file git unzip xz-utils zip libglu1-mesa cmake tar clang ninja-build pkg-config libgtk-3-dev make python3-pip python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse libunwind-dev locate patchelf gir1.2-appindicator3-0.1 libappindicator3-1 libappindicator3-dev libsecret-1-0 libjsoncpp25 libsecret-1-dev libjsoncpp-dev libnotify-bin libnotify-dev mpv libmpv-dev rpm libwebkit2gtk-4.1-0 libwebkit2gtk-4.1-dev libsoup-3.0-0 libsoup-3.0-dev && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /home/flutter - -RUN git clone https://github.com/flutter/flutter.git -b ${FLUTTER_VERSION} --single-branch flutter-sdk - -RUN flutter-sdk/bin/flutter precache - -RUN flutter-sdk/bin/flutter config --no-analytics - -ENV PATH="$PATH:/home/flutter/flutter-sdk/bin" -ENV PATH="$PATH:/home/flutter/flutter-sdk/bin/cache/dart-sdk/bin" -ENV PATH="$PATH:/home/flutter/.pub-cache/bin" -ENV PUB_CACHE="/home/flutter/.pub-cache" - -RUN dart pub global activate flutter_distributor \ No newline at end of file diff --git a/cli/commands/install-dependencies.dart b/cli/commands/install-dependencies.dart index 6875e35f..dc519cc6 100644 --- a/cli/commands/install-dependencies.dart +++ b/cli/commands/install-dependencies.dart @@ -58,6 +58,11 @@ class InstallDependenciesCommand extends Command { ); break; case "ios": + await shell.run( + """ + rustup target add aarch64-apple-ios + """, + ); break; case "android": await shell.run(