Commit Graph

317 Commits

Author SHA1 Message Date
Pedro Pombeiro 58d310ffce
Remove RAM bundle support 2019-08-30 17:13:35 +02:00
Pedro Pombeiro 78754dfdee
Fix local release PR builds (were missing js modules)
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-08-27 11:49:48 +02:00
Jakub Sokołowski 17407b3680
don't go into android dir, copy results if not linking
Signed-off-by: Jakub Sokołowski <jakub@status.im>
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-08-27 09:14:00 +02:00
MajorTomSec 5dbac2b1d9
[Fix 8635] About showed "Version ()" instead of Version 0.14.0 (201908...) on Android
Fixes #8635 by adding VERSION and BUILD_NUMBER files in the correct nix
template and updating bash script in order to prevent it from failing,
due to the git repository being not initialized in the nix environment.

Move scripts/build_no.sh and scripts/gen_build_no.sh to
scripts/version/build_no.sh to prevent Nix from rebuilding when
unrelated scripts are touched.

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2019-08-26 12:51:50 +03:00
Jakub Sokołowski 2b34900a9b
ignore nix/clean.sh failures when in CI
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-08-22 11:46:49 -04:00
Jakub Sokołowski 06dd2e5293
use wait-for.sh to fix nix/clean.sh race condition
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-08-21 18:53:00 -04:00
yenda d61fffb021
remove dev-server and extensions for v1 2019-08-20 17:42:02 +02:00
Pedro Pombeiro f0c3958367
nix: Pass target-os to Nix script
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-08-20 10:02:46 +02:00
bitsikka 39e095e1ed
[8069] feature - [Profile] My profile edit and share screens
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2019-08-19 11:09:38 +03:00
Pedro Pombeiro bdc0ba2680
nix: Reset node_modules when Yarn deps change
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-08-15 11:19:35 +02:00
Pedro Pombeiro 492f2df547
Move version definitions to gradle.properties
- Update minSdkVersion to 18
2019-08-15 11:18:38 +02:00
Pedro Pombeiro ff721ba1bf
nix: Some minor fixes 2019-08-15 11:18:31 +02:00
Pedro Pombeiro f633e168ad
nix: Upgrade to latest gomobile
- Makes a couple of patches redundant;
- Allows specifying min Android SDK level

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-08-02 10:20:52 +02:00
Pedro Pombeiro f691304b9d
Fix minor issues and typos in Android build process
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-08-01 19:34:33 +02:00
Jakub Sokołowski 7517f5235a
use nix shell for nix-update-* targets
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-30 14:11:02 -04:00
Jakub Sokołowski 0b1659fab9
nix: use sha1 for status-go output filenameThis fixes issue with branch names containing slashes.Signed-off-by: Jakub Sokołowski <jakub@status.im>
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-30 09:22:31 -04:00
Pedro Pombeiro 9594552102
nix: Apply some nixfmt suggestions and fix macOS status-go buildInputs
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-07-29 18:01:07 +02:00
Pedro Pombeiro 4ab64d6c40
nix: Fix go-mobile temp folder location in iOS 2019-07-29 15:06:32 +02:00
Pedro Pombeiro acf6278383
nix: Use nix/build.sh for release-android make target
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-26 16:01:06 -04:00
Jakub Sokołowski 2acd5b4cb0
rename prod-build to jsbundle so it means something
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-24 11:56:03 -04:00
Jakub Sokołowski b9ab37019d
build status-go for Nix cache
Also fix scripts/update-status-go.sh to accept commit SHA1

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-23 01:01:41 -04:00
Pedro Pombeiro 67d21c98c1
nix: Use status-go commit sha1 in Nix expression to allow for moving branches
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-20 10:11:34 -04:00
Pedro Pombeiro f6527f014e
nix: Improve some expressions 2019-07-19 20:59:16 +02:00
Pedro Pombeiro 7230897b94
nix: Allow some build directories to stay in mobile node_modules (for caching)
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-07-19 08:37:16 +02:00
Pedro Pombeiro 75d0af862f
nix: Fix non-deterministic gomobile path for iOS 2019-07-19 08:36:49 +02:00
Jakub Sokołowski 0d78e71ece
allow for TARGET_OS to be not set
If we don't we will rebuild status-go for every platform
when we running `make shell`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-07-17 12:07:18 -04:00
Pedro Pombeiro 90fbcfab2b
nix: Only include fastlane in main shell when targetting iOS.
This sidesteps an issue where Nix complains about mismatched hashes in `ruby2.5.3-unf_ext-0.0.7.6` expression for Android CI builds.

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-07-15 16:35:01 +02:00
Pedro Pombeiro a7fd659d84
nix: Wrap gradle, npm packages, `lein prod-build` and `gradle assembleRelease` in Nix expressions to improve reproducible builds with constant build paths 2019-07-15 16:08:02 +02:00
Pedro Pombeiro 0ed6ef59ba
nix: Make status-go mobile artifacts reproducible
- Replace random build paths in with fixed string
- Remove build ID sections
2019-07-15 16:08:01 +02:00
Pedro Pombeiro 48c7f928cd
Clean up some nix files 2019-07-05 13:40:31 +02:00
Pedro Pombeiro 8d8ef4d263
Only bring in Android dependencies in gomobile if targetting Android 2019-07-05 13:40:31 +02:00
Pedro Pombeiro 9b7b5b9608
Ensure a consistent golang version is used throughout Nix 2019-07-05 13:40:30 +02:00
Pedro Pombeiro fad5f318cf
Ensure shell.nix uses same nixpkgs as the rest of the environment
also remove gradle wrapper

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-06-20 09:18:24 -04:00
Pedro Pombeiro 79db8e5107
Upgrade Xcode requirement to 10.2.1
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-06-13 15:03:58 +02:00
Pedro Pombeiro c18e2f8a09
Minor fixes in Nix 2019-06-13 15:03:44 +02:00
Jakub Sokołowski 0e7f73fd11 add NIX_KEEP to add --keep to pyre nix shell
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-06-10 08:07:20 -04:00
Pedro Pombeiro 1457f0f017
Some changes from the node2nix test branch that don't need to be there
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-06-06 19:13:31 +02:00
Pedro Pombeiro ee127722ce
nix: Move debug realm into desktop folder and use RN cli from node_modulesSigned-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com> 2019-05-23 22:54:43 +02:00
hlolli 7ba2a81735
[nix] patch realm as a nodePackage for linux and darwin and use it from nix store, add to default nix-shell buildDependencies, regenerate nodePackages with node2nix 1.6.1 2019-05-23 22:35:01 +02:00
Pedro Pombeiro 373291bfc0
nix: Avoid bad practice of inheriting pkgs
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-21 12:15:56 +02:00
Volodymyr Kozieiev 3939b46930
nix files changed to fetch updated base images for installers
Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>
2019-05-17 12:46:46 +03:00
Jakub Sokołowski aa3c0fb585
add alternative nix-cache in China
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-05-13 19:37:19 +02:00
Pedro Pombeiro b542c7de26
Minor refactoring of the way dependency packages are iterated for shellHook and buildInputs.
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-13 13:08:28 +02:00
Pedro Pombeiro 90d517adf6
nix: Add add-gcroots target to Makefile to avoid garbage collection
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-13 11:33:00 +02:00
Pedro Pombeiro 4041a12612
Print a friendlier message when Xcode/iPhone SDK are not installed
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-10 15:07:52 +02:00
Pedro Pombeiro a09ff50583
nix: Move status-go package further down where it is actually used
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-10 13:31:44 +02:00
Pedro Pombeiro 84dc94f895
nix: name the github sources for readability in logs
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-10 11:49:09 +02:00
Pedro Pombeiro 93efc0cd05
Run prepare-for-desktop.sh in an impure shell 2019-05-10 11:48:32 +02:00
Pedro Pombeiro 62614a71d9
Move shellHook to respective Nix expressions 2019-05-10 11:48:32 +02:00
Pedro Pombeiro fca01891ba
Improvements for a pure macOS Nix environment 2019-05-10 11:48:31 +02:00
Pedro Pombeiro a753be4ab9
Streamline status-go Nix expressions
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-09 14:16:33 +02:00
Pedro Pombeiro 49fbf21f8d
Split status-go Nix package per platform so rebuilds are faster
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-06 14:40:23 +02:00
Pedro Pombeiro 9d1e266145
Use fastlane Nix package instead of ruby/bundler for Android
- iOS still has issues with native Ruby dependencies

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-06 11:57:12 +02:00
Pedro Pombeiro b575f5f6a5
Create androidenv package with accepted license so build can run with --pure 2019-05-06 11:56:51 +02:00
Pedro Pombeiro f329ca9bdf
Add comments to STATUS_GO_VERSION to avoid manual editing
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-05-02 21:44:15 +02:00
Pedro Pombeiro 1dc59cb770
Fix typo in android.nix PATH
Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
2019-04-29 22:17:49 +02:00
Pedro Pombeiro a7f8252d50
Add --pure to nix-shell calls 2019-04-15 20:29:55 +01:00
Pedro Pombeiro d453e510a2
Move shellHook to status-go package
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-12 14:02:04 +02:00
Pedro Pombeiro 8e6b8b1ff1
Use Android SDK from nixpkgs instead of downloading 2019-04-12 13:57:38 +02:00
Pedro Pombeiro 89f34a7707
Improve makefile to only make Nix install the bare minimum for intended platform
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-12 12:18:43 +02:00
Pedro Pombeiro aeacbd928e
Separate logic into shell.nix and derivation.nix to fix `nix build` command
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-11 17:44:29 +02:00
Pedro Pombeiro fe80c7841e
Build Android status-go mobile library on macOS
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-10 11:39:48 +02:00
Jakub Sokołowski 7b309d4875
prevent nix setup running multiple times
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-04-10 10:44:17 +02:00
Pedro Pombeiro 3230f00c6c
Make nix-shell implicit and add `desktop-server` target
- The makefile now defines environment variables for the Desktop debug environment that allows running side by side with release

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-09 16:04:16 +02:00
Pedro Pombeiro ea837ff353
Remove usages of `nix show-derivation` in build-desktop.sh for purity
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-04-09 14:13:14 +02:00
Pedro Pombeiro f048b8a80d
Use gradle 4.10.2 package from nixpkgs so the wrapper doesn't need to download it 2019-04-09 12:44:39 +02:00
Pedro Pombeiro 65e6e80349
Create Nix package for building status-go 2019-04-09 12:44:39 +02:00