From 0427922116518ba5915e7ad443a9433f6b3b8717 Mon Sep 17 00:00:00 2001 From: John Smith Date: Thu, 1 Dec 2022 18:25:53 -0500 Subject: [PATCH] remove cruft fix earthfile --- Earthfile | 6 +++--- veilid-core/src/tests/.gitignore | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 veilid-core/src/tests/.gitignore diff --git a/Earthfile b/Earthfile index 6d385262..7575904e 100644 --- a/Earthfile +++ b/Earthfile @@ -52,9 +52,9 @@ deps-android: FROM +deps-cross RUN apt-get install -y openjdk-9-jdk-headless RUN mkdir /Android; mkdir /Android/Sdk - RUN curl -o /Android/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip + RUN curl -o /Android/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip RUN cd /Android; unzip /Android/cmdline-tools.zip - RUN yes | /Android/cmdline-tools/bin/sdkmanager --sdk_root=/Android/Sdk build-tools\;30.0.3 ndk\;22.0.7026061 cmake\;3.18.1 platform-tools platforms\;android-30 + RUN yes | /Android/cmdline-tools/bin/sdkmanager --sdk_root=/Android/Sdk build-tools\;33.0.1 ndk\;25.1.8937393 cmake\;3.22.1 platform-tools platforms\;android-33 RUN apt-get clean # Just linux build not android @@ -96,7 +96,7 @@ build-linux-arm64: build-android: FROM +code-android WORKDIR /veilid/veilid-core - ENV PATH=$PATH:/Android/Sdk/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin/ + ENV PATH=$PATH:/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/ RUN cargo build --target aarch64-linux-android --release RUN cargo build --target armv7-linux-androideabi --release RUN cargo build --target i686-linux-android --release diff --git a/veilid-core/src/tests/.gitignore b/veilid-core/src/tests/.gitignore deleted file mode 100644 index e8c47856..00000000 --- a/veilid-core/src/tests/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# exclude everything -tmp/* -# exception to the rule -!tmp/.gitkeep