From 8d8ef4d263969aa0675448d1ab611a1c188ad2c2 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Thu, 4 Jul 2019 16:31:34 +0200 Subject: [PATCH] Only bring in Android dependencies in gomobile if targetting Android --- .TOOLVERSIONS | 1 - nix/desktop/realm-node/output/default.nix | 2 +- nix/desktop/realm-node/output/node-env.nix | 15 ++++-- .../realm-node/output/node-packages.nix | 2 +- nix/desktop/realm-node/output/supplement.nix | 2 +- nix/status-go/default.nix | 2 +- nix/status-go/gomobile/default.nix | 8 ++-- scripts/gen-deps-hash.sh | 47 ------------------- scripts/setup | 2 +- 9 files changed, 22 insertions(+), 59 deletions(-) delete mode 100755 scripts/gen-deps-hash.sh diff --git a/.TOOLVERSIONS b/.TOOLVERSIONS index 17dcf111d8..002d5b5ad1 100644 --- a/.TOOLVERSIONS +++ b/.TOOLVERSIONS @@ -1,5 +1,4 @@ android-sdk-build-tools;28.0.1; -android-sdk-platform;android-27; android-sdk;4333796;aa190cfd7299cd6a1c687355bb2764e4 nix;2.2.1; node;10.15.0; diff --git a/nix/desktop/realm-node/output/default.nix b/nix/desktop/realm-node/output/default.nix index 49a790a068..2ead346d4d 100644 --- a/nix/desktop/realm-node/output/default.nix +++ b/nix/desktop/realm-node/output/default.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.1. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/nix/desktop/realm-node/output/node-env.nix b/nix/desktop/realm-node/output/node-env.nix index 175e5104ce..670556bf27 100644 --- a/nix/desktop/realm-node/output/node-env.nix +++ b/nix/desktop/realm-node/output/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar <] -d [-d ]" >&2 - echo - echo "This script calculates a hash representing the required versions of the specified tools" - exit 0 -} - -# some options parsing -deps=() -while getopts "hb:d:" opt; do - case $opt in - b) base_hash="${base_hash}${OPTARG}";; - d) - version=$($toolversion "$OPTARG") - if [ $? -ne 0 ]; then - echo "ERROR: $OPTARG not found in .TOOLVERSIONS" - exit 1 - fi - deps+=("$OPTARG $version") - ;; - h) usage;; - \?) echo "Invalid option: -$OPTARG" >&2; exit 1;; - esac -done - -if [ ${#deps[@]} -eq 0 ]; then - echo "ERROR: No dependencies specified" - echo - usage -fi - -IFS=$'\n' sorted_deps=($(sort <<<"${deps[*]}")) -unset IFS - -hash=$(echo "${base_hash}${sorted_deps[@]}" | md5sum | cut -f1 -d" ") -echo "${hash:0:8}" diff --git a/scripts/setup b/scripts/setup index 37ad475817..1fe66efd44 100755 --- a/scripts/setup +++ b/scripts/setup @@ -28,7 +28,7 @@ if [ $_need_curl -eq 1 ] && ! program_exists "curl"; then exit 1 fi -if is_linux && [ -z "$JENKINS_URL" ]; then +if is_linux && [ -z "$IN_CI_ENVIRONMENT" ]; then watches=$(cat /proc/sys/fs/inotify/max_user_watches) required_watches=524288 if [ $watches -lt $required_watches ]; then