Skip to content

Commit d078f67

Browse files
committed
build: no redundant doChecks, fix android arch
1 parent 7115c2b commit d078f67

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
with:
8484
api-level: 33
8585
target: google_apis
86-
arch: x86_64
86+
arch: arm64-v8a
8787
force-avd-creation: false
8888
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
8989
disable-animations: false

flake.nix

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,12 @@
264264
echo "🔧 Patching aapt2 at $aapt2"
265265
chmod +x "$aapt2"
266266
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$aapt2" || true
267-
patchelf --set-rpath "${env.pkgs.lib.makeLibraryPath [ env.pkgs.stdenv.cc.cc.lib env.pkgs.zlib ]}" "$aapt2" || true
267+
patchelf --set-rpath "${
268+
env.pkgs.lib.makeLibraryPath [
269+
env.pkgs.stdenv.cc.cc.lib
270+
env.pkgs.zlib
271+
]
272+
}" "$aapt2" || true
268273
fi
269274
done
270275
@@ -315,6 +320,7 @@
315320
cargo clippy --all-targets -- -D warnings -W clippy::all -W clippy::pedantic
316321
'';
317322
installPhase = "touch $out";
323+
doCheck = false;
318324
};
319325
coverage = env.rustPlatform.buildRustPackage {
320326
pname = "log-out-coverage";
@@ -334,6 +340,7 @@
334340
--json > $out/coverage.json
335341
'';
336342
installPhase = "true";
343+
doCheck = false;
337344
};
338345
}
339346
);

0 commit comments

Comments
 (0)