new CURRENT_ONLY build/test performance option assumes x86-64 / likely fails on M1 mac

[mikehardy]

shouldn't this determine the correct platform? Seems like cargoBuildX86_64 is an assumption as what the opposite of wantAllPlatforms is. David has an M1 now, for instance. That may be fancy so perhaps a middle-ground would be to failfast if CURRENT_ONLY == true and arch != x86-64 (or linux/x86-64 if it's that specific)

Originally posted by @mikehardy in #202 (comment)

[mikehardy]

Got a timeslice on the M1 we have in the house and for ./test-current.sh the appropriate thing is preBuildMac apparently:

Execution failed for task ':rsdroid-testing:preBuildMac'.

because of

  |
  = note: the `x86_64-apple-darwin` target may not be installed
  = help: consider downloading the target with `rustup target add x86_64-apple-darwin`

For more information about this error, try `rustc --explain E0463`.
error: could not compile `cfg-if` due to previous error

Caused by:
  process didn't exit successfully: `rustc --crate-name cfg_if --edition=2018 /Users/mike/.cargo/registry/src/github.com-1ecc6299db9ec823/cfg-if-1.0.0/src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts --crate-type lib --emit=dep-info,metadata,link -C opt-level=3 -C embed-bitcode=no -C metadata=581f1a16a94707a6 -C extra-filename=-581f1a16a94707a6 --out-dir /Users/mike/work/Ankidroid/Anki-Android-Backend/rslib-bridge/target/x86_64-apple-darwin/release/deps --target x86_64-apple-darwin -L dependency=/Users/mike/work/Ankidroid/Anki-Android-Backend/rslib-bridge/target/x86_64-apple-darwin/release/deps -L dependency=/Users/mike/work/Ankidroid/Anki-Android-Backend/rslib-bridge/target/release/deps --cap-lints allow` (exit status: 1)
warning: build failed, waiting for other jobs to finish...
error: build failed

Here's the diff to PR after merging #202 and after making the rsdroid/build.gradle else dependent on OS version with regard to which one it does, this "cargoBuildArm64" gradle target is just the known-good / tested-locally target that works on M1 macs

diff --git a/rsdroid/build.gradle b/rsdroid/build.gradle
index fd7bb40..d6236b9 100644
--- a/rsdroid/build.gradle
+++ b/rsdroid/build.gradle
@@ -103,7 +103,7 @@ Boolean wantAllPlatforms = System.getenv("CURRENT_ONLY") != "true"
 if (wantAllPlatforms) {
     preBuild.dependsOn "cargoBuild"
 } else {
-    preBuild.dependsOn "cargoBuildX86_64"
+    preBuild.dependsOn "cargoBuildArm64"
 }
 
 signing {
diff --git a/test-current.sh b/test-current.sh
index b8a4960..424bc87 100755
--- a/test-current.sh
+++ b/test-current.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-NO_CROSS=true CURRENT_ONLY=true ./gradlew rsdroid:test rsdroid-instrumented:connectedAndroidTest
+NO_CROSS=true CURRENT_ONLY=true ./gradlew rsdroid:testDebugUnitTest rsdroid-instrumented:connectedDebugAndroidTest
 
diff --git a/tools/doctor.sh b/tools/doctor.sh
index e763124..f650ca0 100755
--- a/tools/doctor.sh
+++ b/tools/doctor.sh
@@ -73,6 +73,11 @@ rustup target add i686-linux-android        # x86
 rustup target add aarch64-linux-android     # arm64
 rustup target add x86_64-linux-android      # x86_64
 
+if [ "$(uname)" == "Darwin" ]; then
+  rustup target add x86_64-apple-darwin     # x86_64 darwin
+  rustup target add aarch64-apple-darwin    # arm64 darwin
+fi
+
 cecho $lgray "Installing cross"
 cargo install cross --git https://github.com/rust-embedded/cross/ --tag v0.2.1 # current requires rust-current
 
@@ -96,4 +101,4 @@ if [[ $(pip3 install stringcase) ]]; then
   ok_echo "Stringcase is installed"
 else
   error_echo "Failed installing stringcase python library"
-fi
\ No newline at end of file
+fi