Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy Android SDK from nix store instead of downloading #7957

Merged
merged 2 commits into from Apr 12, 2019

Conversation

@PombeirP
Copy link
Member

commented Apr 11, 2019

Summary

This PR gets rid of the install_android_sdk/use_android_sdk functions in installers.sh and replaces them with logic in android.nix to copy the nixpkgs cached Android SDK to the usual location, meaning that we now have a single source of truth for the Android SDK component versions we use, and a single download.
It also adds logic to remove the temp Android SDK folder to the clean-nix make target. The next time that a nix command is executed, this folder will be populated from the nix store again.

Testing notes

Manual testing not needed, the automated will be enough to verify that the Android app still runs.

Platforms

  • Android

status: ready

@PombeirP PombeirP requested review from mandrigin, jakubgs and rasom Apr 11, 2019

@PombeirP PombeirP self-assigned this Apr 11, 2019

@status-github-bot status-github-bot bot added this to REVIEW in Pipeline for QA Apr 11, 2019

@status-im-auto

This comment has been minimized.

Copy link
Member

commented Apr 11, 2019

Jenkins Builds

Click to see older builds (61)
Commit #️⃣ Finished (UTC) Duration Platform Result
a714b6d #1 2019-04-11 12:56:21 ~29 sec ios 📄 log
a714b6d #1 2019-04-11 12:56:29 ~34 sec macos 📄 log
✔️ a714b6d #1 2019-04-11 13:26:28 ~30 min android-e2e 📦 apk
✔️ a714b6d #1 2019-04-11 13:26:30 ~30 min windows 📦 exe
597b003 #2 2019-04-11 13:32:51 ~27 sec ios 📄 log
597b003 #2 2019-04-11 13:33:23 ~57 sec macos 📄 log
597b003 #3 2019-04-11 14:00:31 ~26 sec ios 📄 log
597b003 #2 2019-04-11 14:18:49 ~46 min windows 📄 log
597b003 #3 2019-04-11 14:20:22 ~31 sec macos 📄 log
597b003 #2 2019-04-11 14:21:35 ~49 min linux 📄 log
✔️ 597b003 #2 2019-04-11 14:30:02 ~57 min android-e2e 📦 apk
✔️ 597b003 #2 2019-04-11 14:35:11 ~1 hr 2 min android 📦 apk
7120c55 #4 2019-04-11 15:18:41 ~19 sec ios 📄 log
7120c55 #4 2019-04-11 15:18:51 ~27 sec macos 📄 log
16fa643 #5 2019-04-11 15:46:03 ~21 sec ios 📄 log
16fa643 #5 2019-04-11 15:46:13 ~27 sec macos 📄 log
16fa643 #6 2019-04-11 16:02:47 ~28 sec ios 📄 log
✔️ 16fa643 #4 2019-04-11 16:16:20 ~30 min linux 📦 App
✔️ 16fa643 #4 2019-04-11 16:18:25 ~32 min android 📦 apk
✔️ 16fa643 #4 2019-04-11 16:29:56 ~44 min windows 📦 exe
✔️ 16fa643 #5 2019-04-11 16:36:49 ~35 min android-e2e 📦 apk
c63a069 #7 2019-04-11 17:03:43 ~21 sec ios 📄 log
c63a069 #6 2019-04-11 17:03:54 ~29 sec macos 📄 log
c63a069 #8 2019-04-11 17:04:48 ~24 sec ios 📄 log
c63a069 #7 2019-04-11 17:05:12 ~24 sec macos 📄 log
✔️ c63a069 #5 2019-04-11 17:30:52 ~27 min android 📦 apk
✔️ c63a069 #5 2019-04-11 17:31:35 ~28 min windows 📦 exe
✔️ c63a069 #6 2019-04-11 17:37:50 ~34 min android-e2e 📦 apk
✔️ c63a069 #6 2019-04-11 18:18:36 ~26 min linux 📦 App
c63a069 #10 2019-04-12 06:46:21 ~22 sec ios 📄 log
c63a069 #11 2019-04-12 06:49:41 ~18 sec ios 📄 log
c63a069 #12 2019-04-12 06:50:47 ~17 sec ios 📄 log
c63a069 #13 2019-04-12 06:53:47 ~13 sec ios 📄 log
c63a069 #14 2019-04-12 06:54:48 ~14 sec ios 📄 log
c63a069 #15 2019-04-12 06:59:32 ~23 sec ios 📄 log
c63a069 #18 2019-04-12 08:09:58 ~25 sec ios 📄 log
c63a069 #10 2019-04-12 08:10:07 ~28 sec macos 📄 log
c63a069 #11 2019-04-12 08:27:12 ~21 sec macos 📄 log
c63a069 #19 2019-04-12 08:27:27 ~21 sec ios 📄 log
b6f15b1 #17 2019-04-12 07:45:15 ~5 min ios 📄 log
b6f15b1 #9 2019-04-12 07:49:37 ~9 min macos 📄 log
✔️ b6f15b1 #8 2019-04-12 08:35:29 ~55 min linux 📦 App
✔️ b6f15b1 #7 2019-04-12 08:46:01 ~1 hr 6 min android 📦 apk
ca8bd9e #20 2019-04-12 08:54:03 ~15 min ios 📄 log
✔️ ca8bd9e #13 2019-04-12 09:13:55 ~35 min macos 📦 dmg
✔️ ca8bd9e #9 2019-04-12 09:16:18 ~37 min linux 📦 App
✔️ ca8bd9e #8 2019-04-12 09:17:48 ~39 min windows 📦 exe
✔️ ca8bd9e #8 2019-04-12 09:24:03 ~45 min android 📦 apk
✔️ ca8bd9e #9 2019-04-12 09:27:50 ~49 min android-e2e 📦 apk
✔️ ca8bd9e #21 2019-04-12 10:11:00 ~21 min ios 📦 ipa
✔️ 944b010 #15 2019-04-12 10:54:57 ~15 min macos 📦 dmg
✔️ 944b010 #23 2019-04-12 11:06:03 ~27 min ios 📦 ipa
✔️ 944b010 #11 2019-04-12 11:12:06 ~33 min android-e2e 📦 apk
✔️ 944b010 #10 2019-04-12 11:13:53 ~34 min android 📦 apk
✔️ 944b010 #10 2019-04-12 11:17:32 ~38 min windows 📦 exe
✔️ b8185e5 #17 2019-04-12 11:28:35 ~13 min macos 📦 dmg
✔️ b8185e5 #13 2019-04-12 11:37:53 ~22 min android-e2e 📦 apk
✔️ b8185e5 #25 2019-04-12 11:39:43 ~24 min ios 📦 ipa
✔️ b8185e5 #12 2019-04-12 11:39:43 ~24 min windows 📦 exe
✔️ b8185e5 #13 2019-04-12 11:40:16 ~24 min linux 📦 App
✔️ b8185e5 #12 2019-04-12 11:42:54 ~27 min android 📦 apk
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ a88f2e3 #20 2019-04-12 12:15:47 ~13 min macos 📦 dmg
✔️ a88f2e3 #16 2019-04-12 12:21:03 ~19 min linux 📦 App
✔️ a88f2e3 #15 2019-04-12 12:26:23 ~24 min windows 📦 exe
✔️ a88f2e3 #28 2019-04-12 12:32:28 ~30 min ios 📦 ipa
✔️ d453e51 #17 2019-04-12 12:19:36 ~17 min android-e2e 📦 apk
✔️ d453e51 #16 2019-04-12 12:26:22 ~23 min android 📦 apk

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch from a714b6d to 597b003 Apr 11, 2019

Show resolved Hide resolved ci/Jenkinsfile.android Outdated

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch 3 times, most recently from 16fa643 to c63a069 Apr 11, 2019

@mandrigin

This comment has been minimized.

Copy link
Contributor

commented Apr 12, 2019

@jakubgs macos-02 [2019-04-12T06:46:14.189Z] error: opening file '/nix/store/pl98rh8chfsc5a5bl23v6vnj8ks0jrfp-gomobile-20190319-167ebed.drv': No such file or directory :(

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch 2 times, most recently from b6f15b1 to ca8bd9e Apr 12, 2019

Show resolved Hide resolved Makefile
Show resolved Hide resolved scripts/setup
@jakubgs
Copy link
Member

left a comment

The diff of nix/status-go/default.nix is really fucked up. GitHub can't seem to be able to properly diff that.

@status-github-bot status-github-bot bot moved this from REVIEW to TO TEST in Pipeline for QA Apr 12, 2019

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch 2 times, most recently from 4603654 to 944b010 Apr 12, 2019

@PombeirP

This comment has been minimized.

Copy link
Member Author

commented Apr 12, 2019

The diff of nix/status-go/default.nix is really fucked up. GitHub can't seem to be able to properly diff that.

You need to use better tools for the job. I normally check diffs with GitExtensions and BeyondCompare:

image

So actually not much changed there.

@jakubgs

This comment has been minimized.

Copy link
Member

commented Apr 12, 2019

So actually not much changed there.

Yeah, I know. Poor GitHub can't handle .nix files right.

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch 2 times, most recently from 99c07d0 to b8185e5 Apr 12, 2019

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch 2 times, most recently from df62e85 to a0a513a Apr 12, 2019

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch from a0a513a to a88f2e3 Apr 12, 2019

Move shellHook to status-go package
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>

@PombeirP PombeirP force-pushed the feature/nix-android-sdk branch from a88f2e3 to d453e51 Apr 12, 2019

@PombeirP PombeirP merged commit d453e51 into develop Apr 12, 2019

9 of 10 checks passed

packages-check-bot No changes to dependencies
Details
GPG All commits have a verified GPG signature
WIP Ready for review
Details
security/snyk - Gemfile.lock (Status-im) No manifest changes detected
security/snyk - android/app/build.gradle (Status-im) No manifest changes detected
security/snyk - android/build.gradle (Status-im) No manifest changes detected
security/snyk - modules/react-native-desktop-linking/package.json (Status-im) No manifest changes detected
security/snyk - modules/react-native-desktop-notification/package.json (Status-im) No manifest changes detected
security/snyk - modules/react-native-status/package.json (Status-im) No manifest changes detected
security/snyk - test/appium/requirements.txt (Status-im) No manifest changes detected

Pipeline for QA automation moved this from TO TEST to DONE Apr 12, 2019

@delete-merged-branch delete-merged-branch bot deleted the feature/nix-android-sdk branch Apr 12, 2019

@PombeirP PombeirP added the nix label Apr 12, 2019

@status-github-bot

This comment has been minimized.

Copy link

commented May 11, 2019

Pull Request Checklist

  • Have you updated the documentation, if impacted (e.g. docs.status.im)?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
You can’t perform that action at this time.